|
|
@@ -3,7 +3,6 @@
|
|
|
<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/nutrition/controller/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoUrl.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -452,6 +451,7 @@
|
|
|
<workItem from="1697069087513" duration="2961000" />
|
|
|
<workItem from="1697187582893" duration="2329000" />
|
|
|
<workItem from="1697415101210" duration="4871000" />
|
|
|
+ <workItem from="1697503063474" duration="3683000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -590,10 +590,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="360" y="413" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694419923508" />
|
|
|
- <state x="1215" y="438" key="FileChooserDialogImpl" timestamp="1697102532501">
|
|
|
+ <state x="1215" y="438" key="FileChooserDialogImpl" timestamp="1697524536365">
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="1215" y="438" key="FileChooserDialogImpl/0.0.2194.1194@0.0.2194.1194" timestamp="1697102532501" />
|
|
|
+ <state x="1215" y="438" key="FileChooserDialogImpl/0.0.2194.1194@0.0.2194.1194" timestamp="1697524536365" />
|
|
|
<state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1694766099303" />
|
|
|
<state width="498" height="446" key="SwitcherDM" timestamp="1693380266237">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
