|
@@ -4,6 +4,9 @@
|
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" 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$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -200,7 +203,7 @@
|
|
|
<workItem from="1670287594399" duration="11535000" />
|
|
|
<workItem from="1670461023846" duration="27678000" />
|
|
|
<workItem from="1670547445908" duration="12147000" />
|
|
|
- <workItem from="1670633686675" duration="3589000" />
|
|
|
+ <workItem from="1670633686675" duration="3728000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -299,10 +302,10 @@
|
|
|
</state>
|
|
|
<state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1665835639346" />
|
|
|
<state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1670637914341" />
|
|
|
- <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670486493063">
|
|
|
+ <state x="1057" y="460" width="746" height="548" key="find.popup" timestamp="1670651691149">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670486493063" />
|
|
|
+ <state x="1057" y="460" width="746" height="548" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1670651691149" />
|
|
|
<state x="1291" y="317" key="run.anything.popup" timestamp="1668056889671">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|