|
|
|
|
@ -4,11 +4,7 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<list default="true" id="bba269c0-1ed7-4666-beba-a3554735c261" name="更改" comment="" />
|
|
|
|
|
=======
|
|
|
|
|
<list default="true" id="496ba640-abe8-45b2-825d-dbb362f422fe" name="更改" comment="" />
|
|
|
|
|
>>>>>>> 3ff39d6e1bc2c76b5a0a9d394a602e712f327368
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
|
|
@ -17,17 +13,10 @@
|
|
|
|
|
<component name="Git.Settings">
|
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
|
</component>
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<component name="ProjectColorInfo">{
|
|
|
|
|
"associatedIndex": 0
|
|
|
|
|
}</component>
|
|
|
|
|
<component name="ProjectId" id="34GbnsM5lf8vxTZ8TKf5DRlnLx3" />
|
|
|
|
|
=======
|
|
|
|
|
<component name="ProjectColorInfo"><![CDATA[{
|
|
|
|
|
"associatedIndex": 4
|
|
|
|
|
}]]></component>
|
|
|
|
|
<component name="ProjectId" id="33yFAzru0bn5YuOQyYRfboyeACH" />
|
|
|
|
|
>>>>>>> 3ff39d6e1bc2c76b5a0a9d394a602e712f327368
|
|
|
|
|
<component name="ProjectViewState">
|
|
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
|
|
@ -37,17 +26,10 @@
|
|
|
|
|
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
"git-widget-placeholder": "djq__branch",
|
|
|
|
|
"ignore.virus.scanning.warn.message": "true",
|
|
|
|
|
"last_opened_file_path": "D:/软件工程方法学/djq",
|
|
|
|
|
"settings.editor.selected.configurable": "com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
|
|
|
|
|
=======
|
|
|
|
|
"git-widget-placeholder": "master",
|
|
|
|
|
"ignore.virus.scanning.warn.message": "true",
|
|
|
|
|
"last_opened_file_path": "D:/软件工程方法学/ccy"
|
|
|
|
|
>>>>>>> 3ff39d6e1bc2c76b5a0a9d394a602e712f327368
|
|
|
|
|
}
|
|
|
|
|
}]]></component>
|
|
|
|
|
<component name="SharedIndexes">
|
|
|
|
|
@ -59,7 +41,6 @@
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TaskManager">
|
|
|
|
|
<task active="true" id="Default" summary="默认任务">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<changelist id="bba269c0-1ed7-4666-beba-a3554735c261" name="更改" comment="" />
|
|
|
|
|
<created>1760843025691</created>
|
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
|
@ -79,14 +60,4 @@
|
|
|
|
|
</breakpoints>
|
|
|
|
|
</breakpoint-manager>
|
|
|
|
|
</component>
|
|
|
|
|
=======
|
|
|
|
|
<changelist id="496ba640-abe8-45b2-825d-dbb362f422fe" name="更改" comment="" />
|
|
|
|
|
<created>1760281265610</created>
|
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
|
<updated>1760281265610</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
>>>>>>> 3ff39d6e1bc2c76b5a0a9d394a602e712f327368
|
|
|
|
|
</project>
|
