|
@@ -3,8 +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/nutrition/controller/SeriesManage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesManage.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/series_manage/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/series_manage/index_search.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleComment.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleComment.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_comment/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_comment/index_search.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -268,7 +268,7 @@
|
|
|
<workItem from="1679014817602" duration="22183000" />
|
|
|
<workItem from="1679287382176" duration="14525000" />
|
|
|
<workItem from="1679359715116" duration="25702000" />
|
|
|
- <workItem from="1679532313623" duration="19922000" />
|
|
|
+ <workItem from="1679532313623" duration="20027000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|