|
@@ -4,8 +4,8 @@
|
|
|
<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/ArticleReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleReport.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_report/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_report/form.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/datum_report/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/datum_report/form.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoReport.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_report/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_report/form.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -201,7 +201,7 @@
|
|
|
<workItem from="1670201125142" duration="9015000" />
|
|
|
<workItem from="1670287594399" duration="11535000" />
|
|
|
<workItem from="1670461023846" duration="27678000" />
|
|
|
- <workItem from="1670547445908" duration="5616000" />
|
|
|
+ <workItem from="1670547445908" duration="5697000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|