|
@@ -25,7 +25,9 @@
|
|
</select>
|
|
</select>
|
|
</component>
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
- <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="" />
|
|
|
|
|
|
+ <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="">
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/fiveep.iws" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.iws" 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" />
|
|
@@ -192,6 +194,16 @@
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
</component>
|
|
</component>
|
|
|
|
+ <component name="GitRewordedCommitMessages">
|
|
|
|
+ <option name="commitMessagesMapping">
|
|
|
|
+ <RewordedCommitMessageMapping>
|
|
|
|
+ <option name="originalMessage" value="update config" />
|
|
|
|
+ <option name="rewordedMessage" value="update config" />
|
|
|
|
+ </RewordedCommitMessageMapping>
|
|
|
|
+ </option>
|
|
|
|
+ <option name="currentCommit" value="1" />
|
|
|
|
+ <option name="onto" value="fa1015a0efe1792605de5be1297d179cd470b713" />
|
|
|
|
+ </component>
|
|
<component name="HierarchyBrowserManager">
|
|
<component name="HierarchyBrowserManager">
|
|
<option name="SHOW_PACKAGES" value="false" />
|
|
<option name="SHOW_PACKAGES" value="false" />
|
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
|
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
|
@@ -347,7 +359,19 @@
|
|
<map>
|
|
<map>
|
|
<entry key="MAIN">
|
|
<entry key="MAIN">
|
|
<value>
|
|
<value>
|
|
- <State />
|
|
|
|
|
|
+ <State>
|
|
|
|
+ <option name="FILTERS">
|
|
|
|
+ <map>
|
|
|
|
+ <entry key="branch">
|
|
|
|
+ <value>
|
|
|
|
+ <list>
|
|
|
|
+ <option value="feature-management-2021-9-16" />
|
|
|
|
+ </list>
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ </map>
|
|
|
|
+ </option>
|
|
|
|
+ </State>
|
|
</value>
|
|
</value>
|
|
</entry>
|
|
</entry>
|
|
</map>
|
|
</map>
|
|
@@ -406,6 +430,10 @@
|
|
<webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
|
|
<webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
|
|
</component>
|
|
</component>
|
|
<component name="WindowStateProjectService">
|
|
<component name="WindowStateProjectService">
|
|
|
|
+ <state x="839" y="449" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog" timestamp="1654737002927">
|
|
|
|
+ <screen x="0" y="0" width="1920" height="1080" />
|
|
|
|
+ </state>
|
|
|
|
+ <state x="839" y="449" key="Git.Rebase.Log.Action.NewCommitMessage.Dialog/0.0.1920.1080@0.0.1920.1080" timestamp="1654737002927" />
|
|
<state x="661" y="295" width="598" height="490" key="find.popup" timestamp="1654483859318">
|
|
<state x="661" y="295" width="598" height="490" key="find.popup" timestamp="1654483859318">
|
|
<screen x="0" y="0" width="1920" height="1080" />
|
|
<screen x="0" y="0" width="1920" height="1080" />
|
|
</state>
|
|
</state>
|