Michel/Gestion_sondes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fusion develop into product + résolution conflits

Browse Source
This commit is contained in:
Michel
2025-04-17 19:36:37 +02:00
parent f43dfde143 3c9bf70297
commit 1d17bd7624
3 changed files with 95 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/workspace.xml generated
View File

@@ -5,9 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a12d9762-568e-4ace-91c1-148c598387a7" name="Changes" comment="&quot;Ajout bt impression rapports et dossier PDF crée&quot;">
<change afterPath="$PROJECT_DIR$/tools/deploy_product.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Chat-Id.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Chaufferie.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Scripts/.deploy.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Scripts/.deploy.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/domo91.py" beforeDir="false" afterPath="$PROJECT_DIR$/domo91.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,10 +22,13 @@
</list>
</option>
</component>
<component name="Git.Merge.Settings">
<option name="BRANCH" value="develop" />
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="product" />
<entry key="$PROJECT_DIR$" value="develop" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -88,7 +92,7 @@
"Python.test.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
"git-widget-placeholder": "product",
"git-widget-placeholder": "Merging product",
"ignore.virus.scanning.warn.message": "true",
"last_opened_file_path": "C:/Users/miche/PycharmProjects/Gestion sondes",
"settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable",
@@ -136,7 +140,7 @@
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-python-sdk-4f4e415b4190-aa17d162503b-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-243.26053.29" />
<option value="bundled-python-sdk-348a24fa61fa-5312c7369657-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-251.23774.444" />
</set>
</attachedChunks>
</component>