|
|
|
@ -21,7 +21,6 @@
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="af7ffdf2-4ddc-4ed6-8222-60ed5acbc2ed" name="Default Changelist" comment="">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Rocket.md" beforeDir="false" afterPath="$PROJECT_DIR$/Rocket.md" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -659,17 +658,13 @@
|
|
|
|
|
</entry>
|
|
|
|
|
<entry key="MAIN">
|
|
|
|
|
<value>
|
|
|
|
|
<State />
|
|
|
|
|
<State>
|
|
|
|
|
<option name="COLUMN_ORDER" />
|
|
|
|
|
</State>
|
|
|
|
|
</value>
|
|
|
|
|
</entry>
|
|
|
|
|
</map>
|
|
|
|
|
</option>
|
|
|
|
|
<option name="OPEN_GENERIC_TABS">
|
|
|
|
|
<map>
|
|
|
|
|
<entry key="1" value="TOOL_WINDOW" />
|
|
|
|
|
</map>
|
|
|
|
|
</option>
|
|
|
|
|
<option name="oldMeFiltersMigrated" value="true" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
|
|
<MESSAGE value="add q736" />
|
|
|
|
@ -709,10 +704,10 @@
|
|
|
|
|
</state>
|
|
|
|
|
<state x="303" y="50" key="CommitChangelistDialog2/0.0.1440.900@0.0.1440.900" timestamp="1588749779133" />
|
|
|
|
|
<state x="404" y="60" key="CommitChangelistDialog2/0.0.1920.1080@0.0.1920.1080" timestamp="1591633493160" />
|
|
|
|
|
<state x="191" y="94" width="1152" height="720" key="DiffContextDialog" timestamp="1591262490778">
|
|
|
|
|
<screen x="0" y="0" width="1920" height="1080" />
|
|
|
|
|
<state x="143" y="78" width="1152" height="720" key="DiffContextDialog" timestamp="1592386883631">
|
|
|
|
|
<screen x="0" y="0" width="1440" height="900" />
|
|
|
|
|
</state>
|
|
|
|
|
<state x="143" y="78" width="1152" height="720" key="DiffContextDialog/0.0.1440.900@0.0.1440.900" timestamp="1588749770793" />
|
|
|
|
|
<state x="143" y="78" width="1152" height="720" key="DiffContextDialog/0.0.1440.900@0.0.1440.900" timestamp="1592386883631" />
|
|
|
|
|
<state x="191" y="94" key="DiffContextDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1591262490778" />
|
|
|
|
|
<state x="143" y="78" width="1152" height="720" key="DiffContextDialog/0.23.1440.797@0.23.1440.797" timestamp="1588303139733" />
|
|
|
|
|
<state width="1878" height="380" key="GridCell.Tab.0.bottom" timestamp="1591595634376">
|
|
|
|
@ -797,6 +792,11 @@
|
|
|
|
|
</state>
|
|
|
|
|
<state x="378" y="207" width="683" height="486" key="find.popup/0.0.1440.900@0.0.1440.900" timestamp="1586846937826" />
|
|
|
|
|
<state x="504" y="248" width="911" height="584" key="find.popup/0.0.1920.1080@0.0.1920.1080" timestamp="1591635370753" />
|
|
|
|
|
<state x="479" y="282" key="git4idea.merge.GitPullDialog" timestamp="1592386874207">
|
|
|
|
|
<screen x="0" y="0" width="1440" height="900" />
|
|
|
|
|
</state>
|
|
|
|
|
<state x="479" y="282" key="git4idea.merge.GitPullDialog/0.0.1440.900@0.0.1440.900" timestamp="1592386874207" />
|
|
|
|
|
<state x="638" y="338" key="git4idea.merge.GitPullDialog/0.0.1920.1080@0.0.1920.1080" timestamp="1591809009592" />
|
|
|
|
|
<state x="385" y="196" width="670" height="676" key="search.everywhere.popup" timestamp="1587219643331">
|
|
|
|
|
<screen x="0" y="0" width="1440" height="900" />
|
|
|
|
|
</state>
|
|
|
|
|