|
@@ -2,8 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/style/nHeader.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -206,7 +205,7 @@
|
|
|
<workItem from="1585628259581" duration="1403000" />
|
|
|
<workItem from="1585706005737" duration="789000" />
|
|
|
<workItem from="1585792990603" duration="197000" />
|
|
|
- <workItem from="1585812151059" duration="10000" />
|
|
|
+ <workItem from="1585812151059" duration="232000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|