|
@@ -3,7 +3,8 @@
|
|
|
<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/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/common/model/VideoIntro.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/VideoIntro.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -169,7 +170,7 @@
|
|
|
<workItem from="1666574984353" duration="7852000" />
|
|
|
<workItem from="1666659002848" duration="14268000" />
|
|
|
<workItem from="1666746114555" duration="18673000" />
|
|
|
- <workItem from="1666833605829" duration="15154000" />
|
|
|
+ <workItem from="1666833605829" duration="16180000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|