|
@@ -4,7 +4,6 @@
|
|
|
<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/nutrition/controller/VideoManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoManage.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_manage/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_manage/index_search.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -193,7 +192,7 @@
|
|
|
<workItem from="1669597148644" duration="17061000" />
|
|
|
<workItem from="1669682447842" duration="24394000" />
|
|
|
<workItem from="1669769873624" duration="5352000" />
|
|
|
- <workItem from="1669776182613" duration="11016000" />
|
|
|
+ <workItem from="1669776182613" duration="11039000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|