|
@@ -1,12 +1,31 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
+ <component name="BranchesTreeState">
|
|
|
+ <expand>
|
|
|
+ <path>
|
|
|
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ </path>
|
|
|
+ </expand>
|
|
|
+ <select>
|
|
|
+ <path>
|
|
|
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ <item name="BRANCH:feature-management-2021-9-16" type="e8cecc67:BranchNodeDescriptor" />
|
|
|
+ </path>
|
|
|
+ </select>
|
|
|
+ </component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-dev.properties" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-prod.properties" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep-controller/src/main/resources/application-prod.properties" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/fiveep.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.ipr" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/fiveep.iws" beforeDir="false" afterPath="$PROJECT_DIR$/fiveep.iws" afterDir="false" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="a29cbb71-d42d-449d-9ff0-42f54f931d12" name="Default Changelist" comment="" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -323,6 +342,17 @@
|
|
|
<is-autoscroll-to-source value="true" />
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
+ <component name="Vcs.Log.Tabs.Properties">
|
|
|
+ <option name="TAB_STATES">
|
|
|
+ <map>
|
|
|
+ <entry key="MAIN">
|
|
|
+ <value>
|
|
|
+ <State />
|
|
|
+ </value>
|
|
|
+ </entry>
|
|
|
+ </map>
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
<component name="VssConfiguration">
|
|
|
<CheckoutOptions>
|
|
|
<option name="COMMENT" value="" />
|