|
@@ -3,14 +3,10 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" 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$/404.html" beforeDir="false" afterPath="$PROJECT_DIR$/404.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/css/exam_detail.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/exam_detail.css" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/h_exam/exam_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/h_exam/exam_detail_img.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail_img.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/h_exam/exam_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_list.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/h_news/news_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_news/news_detail.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/h_news/news_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_news/news_list.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/xgk/xgk.html" beforeDir="false" afterPath="$PROJECT_DIR$/xgk/xgk.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/js/components.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/components.js" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -99,26 +95,71 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="171">
|
|
|
- <caret line="224" column="8" lean-forward="true" selection-start-line="224" selection-start-column="8" selection-end-line="224" selection-end-column="8" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="330">
|
|
|
+ <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="108">
|
|
|
- <caret line="70" column="12" lean-forward="true" selection-start-line="70" selection-start-column="12" selection-end-line="70" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="297">
|
|
|
+ <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="198">
|
|
|
+ <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/components.less">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-1601">
|
|
|
+ <caret line="745" column="25" selection-start-line="745" selection-start-column="25" selection-end-line="745" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="231">
|
|
|
+ <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -177,9 +218,10 @@
|
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="-7" />
|
|
|
+ <option name="x" value="-232" />
|
|
|
+ <option name="y" value="222" />
|
|
|
<option name="width" value="1933" />
|
|
|
- <option name="height" value="1047" />
|
|
|
+ <option name="height" value="1046" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
@@ -187,23 +229,28 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
<path>
|
|
|
- <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
- <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="h_news" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="gs_try" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="h_exam" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -229,6 +276,146 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Updated" />
|
|
|
+ <option name="myStatusName" value="Changed" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="UPDATED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Created" />
|
|
|
+ <option name="myStatusName" value="Created" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="CREATED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Deleted" />
|
|
|
+ <option name="myStatusName" value="Deleted" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="true" />
|
|
|
+ <option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Restored" />
|
|
|
+ <option name="myStatusName" value="Will be restored" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="RESTORED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Modified" />
|
|
|
+ <option name="myStatusName" value="Modified" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MODIFIED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Skipped" />
|
|
|
+ <option name="myStatusName" value="Skipped" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="SKIPPED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with conflicts" />
|
|
|
+ <option name="myStatusName" value="Will be merged with conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with tree conflicts" />
|
|
|
+ <option name="myStatusName" value="Merged with tree conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged with property conflicts" />
|
|
|
+ <option name="myStatusName" value="Will be merged with property conflicts" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Merged" />
|
|
|
+ <option name="myStatusName" value="Will be merged" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="MERGED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Not in repository" />
|
|
|
+ <option name="myStatusName" value="Not in repository" />
|
|
|
+ <option name="mySupportsDeletion" value="true" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="UNKNOWN" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Locally added" />
|
|
|
+ <option name="myStatusName" value="Locally added" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="LOCALLY_ADDED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Locally removed" />
|
|
|
+ <option name="myStatusName" value="Locally removed" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="LOCALLY_REMOVED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Switched" />
|
|
|
+ <option name="myStatusName" value="Switched" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="SWITCHED" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" value="Updated from server" />
|
|
|
+ <option name="myStatusName" value="Changed on server" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" value="CHANGED_ON_SERVER" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Updated" />
|
|
|
<option name="myStatusName" value="Changed" />
|
|
@@ -242,6 +429,90 @@
|
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/h_news/news_list.html</PATH>
|
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/index.html</PATH>
|
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/xgk/xgk.html</PATH>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Created" />
|
|
@@ -251,6 +522,55 @@
|
|
|
<option name="myId" value="CREATED" />
|
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/404.html</PATH>
|
|
|
<PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/404.png</PATH>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Deleted" />
|
|
@@ -258,6 +578,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="true" />
|
|
|
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Restored" />
|
|
@@ -265,6 +620,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="RESTORED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
@@ -273,6 +663,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="MODIFIED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Skipped" />
|
|
@@ -280,6 +705,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="SKIPPED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Merged with conflicts" />
|
|
@@ -287,6 +747,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="MERGED_WITH_CONFLICTS" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Merged with tree conflicts" />
|
|
@@ -294,6 +789,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Merged with property conflicts" />
|
|
@@ -301,6 +831,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Merged" />
|
|
@@ -308,6 +873,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="MERGED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Not in repository" />
|
|
@@ -315,6 +915,41 @@
|
|
|
<option name="mySupportsDeletion" value="true" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="UNKNOWN" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Locally added" />
|
|
@@ -322,6 +957,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="LOCALLY_ADDED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Locally removed" />
|
|
@@ -329,6 +999,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="LOCALLY_REMOVED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
<FILE-GROUP>
|
|
|
<option name="myUpdateName" value="Switched" />
|
|
@@ -336,6 +1041,41 @@
|
|
|
<option name="mySupportsDeletion" value="false" />
|
|
|
<option name="myCanBeAbsent" value="false" />
|
|
|
<option name="myId" value="SWITCHED" />
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
+ <FILE-GROUP>
|
|
|
+ <option name="myUpdateName" />
|
|
|
+ <option name="myStatusName" />
|
|
|
+ <option name="mySupportsDeletion" value="false" />
|
|
|
+ <option name="myCanBeAbsent" value="false" />
|
|
|
+ <option name="myId" />
|
|
|
+ </FILE-GROUP>
|
|
|
</FILE-GROUP>
|
|
|
</UpdatedFiles>
|
|
|
</component>
|
|
@@ -488,7 +1228,7 @@
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1369936" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16044776" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -614,11 +1354,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2646">
|
|
|
- <caret line="98" column="83" selection-start-line="98" selection-start-column="83" selection-end-line="98" selection-end-column="83" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="231">
|
|
|
+ <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -631,8 +1368,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/xgk/xgk.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1647">
|
|
|
- <caret line="61" column="30" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -648,8 +1385,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="288">
|
|
|
- <caret line="44" column="38" lean-forward="true" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
|
|
|
+ <state relative-caret-position="198">
|
|
|
+ <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -658,21 +1395,15 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/h_news/news_list.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="108">
|
|
|
- <caret line="70" column="12" lean-forward="true" selection-start-line="70" selection-start-column="12" selection-end-line="70" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="297">
|
|
|
+ <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="171">
|
|
|
- <caret line="224" column="8" lean-forward="true" selection-start-line="224" selection-start-column="8" selection-end-line="224" selection-end-column="8" />
|
|
|
- <folding>
|
|
|
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="330">
|
|
|
+ <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|