|
@@ -1,10 +1,7 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="87572a4c-083a-4867-bf68-b26db7dfbec8" name="Default" comment="1111">
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="87572a4c-083a-4867-bf68-b26db7dfbec8" name="Default" comment="" />
|
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
|
<ignored path="$PROJECT_DIR$/temp/" />
|
|
|
<ignored path="$PROJECT_DIR$/tmp/" />
|
|
@@ -55,8 +52,8 @@
|
|
|
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="119">
|
|
|
- <caret line="63" column="8" lean-forward="true" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" />
|
|
|
+ <state relative-caret-position="65">
|
|
|
+ <caret line="61" column="8" lean-forward="true" selection-start-line="61" selection-start-column="8" selection-end-line="61" selection-end-column="8" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -77,7 +74,7 @@
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
<push-targets>
|
|
|
- <push-target-info target-remote="origin" target-branch="developer" repo="$PROJECT_DIR$" source="master" />
|
|
|
+ <push-target-info target-remote="origin" target-branch="master" repo="$PROJECT_DIR$" source="master" />
|
|
|
</push-targets>
|
|
|
</component>
|
|
|
<component name="IdeDocumentHistory">
|
|
@@ -263,7 +260,7 @@
|
|
|
<workItem from="1565079382324" duration="4874000" />
|
|
|
<workItem from="1565336113260" duration="2907000" />
|
|
|
<workItem from="1565571669989" duration="9466000" />
|
|
|
- <workItem from="1565598686506" duration="2935000" />
|
|
|
+ <workItem from="1565598686506" duration="3488000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="1111">
|
|
|
<created>1565600428320</created>
|
|
@@ -283,12 +280,12 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="20182000" />
|
|
|
+ <option name="totallyTimeSpent" value="20735000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="30" y="0" width="1364" height="726" extended-state="0" />
|
|
|
<layout>
|
|
|
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25339368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25339368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34175083" sideWeight="0.2775264" order="7" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32996634" sideWeight="0.49396682" order="1" side_tool="false" content_ui="tabs" />
|
|
@@ -296,7 +293,7 @@
|
|
|
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34175083" sideWeight="0.7224736" order="7" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34175083" sideWeight="0.7224736" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
@@ -613,8 +610,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="119">
|
|
|
- <caret line="63" column="8" lean-forward="true" selection-start-line="63" selection-start-column="8" selection-end-line="63" selection-end-column="8" />
|
|
|
+ <state relative-caret-position="65">
|
|
|
+ <caret line="61" column="8" lean-forward="true" selection-start-line="61" selection-start-column="8" selection-end-line="61" selection-end-column="8" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|