|
@@ -3,7 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<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/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Base.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Base.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -205,7 +205,7 @@
|
|
|
<workItem from="1670719843429" duration="8446000" />
|
|
|
<workItem from="1670807412269" duration="9728000" />
|
|
|
<workItem from="1671065604459" duration="7662000" />
|
|
|
- <workItem from="1671152221434" duration="11950000" />
|
|
|
+ <workItem from="1671152221434" duration="12014000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|