|
@@ -4,7 +4,9 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="" />
|
|
|
|
|
|
|
+ <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="">
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
+ </list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -26,7 +28,7 @@
|
|
|
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
- "git-widget-placeholder": "develop",
|
|
|
|
|
|
|
+ "git-widget-placeholder": "story-237",
|
|
|
"junie.onboarding.icon.badge.shown": "true",
|
|
"junie.onboarding.icon.badge.shown": "true",
|
|
|
"last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
|
|
"last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
|
|
|
"node.js.detected.package.eslint": "true",
|
|
"node.js.detected.package.eslint": "true",
|