|
@@ -4,7 +4,6 @@
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" name="Default Changelist" comment="">
|
|
<list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" 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/store/view/banner/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/banner/form.html" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/application/store/view/banner/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/banner/form.html" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/application/store/view/banner/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/banner/index.html" 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" />
|
|
@@ -149,7 +148,7 @@
|
|
<workItem from="1661734371076" duration="15282000" />
|
|
<workItem from="1661734371076" duration="15282000" />
|
|
<workItem from="1661820079823" duration="2898000" />
|
|
<workItem from="1661820079823" duration="2898000" />
|
|
<workItem from="1661907611720" duration="5931000" />
|
|
<workItem from="1661907611720" duration="5931000" />
|
|
- <workItem from="1661993135050" duration="1193000" />
|
|
|
|
|
|
+ <workItem from="1661993135050" duration="1270000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|