|
@@ -3,7 +3,7 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<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/common/library/Shande.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/library/Shande.php" afterDir="false" />
|
|
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/store/controller/Config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/Config.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" />
|
|
@@ -151,7 +151,7 @@
|
|
<workItem from="1661993135050" duration="4377000" />
|
|
<workItem from="1661993135050" duration="4377000" />
|
|
<workItem from="1662078426211" duration="8432000" />
|
|
<workItem from="1662078426211" duration="8432000" />
|
|
<workItem from="1662190020639" duration="1313000" />
|
|
<workItem from="1662190020639" duration="1313000" />
|
|
- <workItem from="1662338106399" duration="737000" />
|
|
|
|
|
|
+ <workItem from="1662338106399" duration="1963000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|