|
@@ -3,7 +3,7 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
|
|
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/application/nutrition/view/video_comment/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/video_comment/index.html" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -230,7 +230,7 @@
|
|
<workItem from="1675904734949" duration="20832000" />
|
|
<workItem from="1675904734949" duration="20832000" />
|
|
<workItem from="1675990026788" duration="13260000" />
|
|
<workItem from="1675990026788" duration="13260000" />
|
|
<workItem from="1676077132290" duration="20234000" />
|
|
<workItem from="1676077132290" duration="20234000" />
|
|
- <workItem from="1676250114476" duration="4382000" />
|
|
|
|
|
|
+ <workItem from="1676250114476" duration="4780000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|