|
@@ -4,6 +4,7 @@
|
|
|
<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/api/controller/VideoDemand.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/VideoDemand.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/vendor/composer/installed.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/installed.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -175,7 +176,8 @@
|
|
|
<workItem from="1660524906166" duration="3097000" />
|
|
|
<workItem from="1660611515701" duration="6983000" />
|
|
|
<workItem from="1660697982291" duration="9650000" />
|
|
|
- <workItem from="1660730926670" duration="346000" />
|
|
|
+ <workItem from="1660730926670" duration="1018000" />
|
|
|
+ <workItem from="1660783282150" duration="1196000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -219,10 +221,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="459" y="215" width="1942" height="1088" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1658395058691" />
|
|
|
- <state x="1063" y="515" key="com.intellij.ide.util.TipDialog" timestamp="1660611547595">
|
|
|
+ <state x="1059" y="515" key="com.intellij.ide.util.TipDialog" timestamp="1660784519853">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1063" y="515" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1660611547595" />
|
|
|
+ <state x="1059" y="515" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1660784519853" />
|
|
|
<state x="1166" y="605" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1659576135820">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|