|
|
@@ -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/nutrition/controller/CommentReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/CommentReport.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/text.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/text.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -443,7 +443,7 @@
|
|
|
<workItem from="1694739473903" duration="20371000" />
|
|
|
<workItem from="1694997975324" duration="5574000" />
|
|
|
<workItem from="1695085328694" duration="21844000" />
|
|
|
- <workItem from="1695603648860" duration="21222000" />
|
|
|
+ <workItem from="1695603648860" duration="21543000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -577,10 +577,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695607260540" />
|
|
|
- <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog" timestamp="1694419923508">
|
|
|
+ <state x="360" y="413" width="1942" height="1088" key="DiffContextDialog" timestamp="1695633841041">
|
|
|
<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="360" y="413" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1695633841041" />
|
|
|
<state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1695632134462">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
