|
@@ -3,7 +3,7 @@
|
|
|
<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/order/view/store_order/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/view/store_order/detail.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -420,7 +420,7 @@
|
|
|
<workItem from="1694392543142" duration="23428000" />
|
|
|
<workItem from="1694480523673" duration="21063000" />
|
|
|
<workItem from="1694565971470" duration="21552000" />
|
|
|
- <workItem from="1694652561038" duration="14427000" />
|
|
|
+ <workItem from="1694652561038" duration="14501000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|