|
@@ -3,6 +3,8 @@
|
|
|
<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/TopSearch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/TopSearch.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/top_search/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/top_search/form.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -462,7 +464,7 @@
|
|
|
<workItem from="1698193315048" duration="3089000" />
|
|
|
<workItem from="1698278978424" duration="6616000" />
|
|
|
<workItem from="1698366118916" duration="3362000" />
|
|
|
- <workItem from="1698402098788" duration="371000" />
|
|
|
+ <workItem from="1698402098788" duration="3004000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -592,10 +594,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1245" y="552" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1695006721171" />
|
|
|
- <state x="948" y="400" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1697003431551">
|
|
|
+ <state x="948" y="400" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1698629360841">
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="948" y="400" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2194.1194@0.0.2194.1194" timestamp="1697003431551" />
|
|
|
+ <state x="948" y="400" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2194.1194@0.0.2194.1194" timestamp="1698629360841" />
|
|
|
<state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1694673363941" />
|
|
|
<state x="360" y="413" width="1942" height="1088" key="DiffContextDialog" timestamp="1694419923508">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
@@ -618,10 +620,10 @@
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
<state x="999" y="516" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2194.1194@0.0.2194.1194" timestamp="1696929992529" />
|
|
|
- <state x="588" y="133" width="1206" height="901" key="find.popup" timestamp="1698135113221">
|
|
|
+ <state x="588" y="133" width="1206" height="901" key="find.popup" timestamp="1698627737634">
|
|
|
<screen x="0" y="0" width="2194" height="1194" />
|
|
|
</state>
|
|
|
- <state x="588" y="133" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1698135113221" />
|
|
|
+ <state x="588" y="133" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1698627737634" />
|
|
|
<state x="686" y="156" width="1407" height="1056" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1694499272246" />
|
|
|
<state x="1282" y="549" key="ftp.server.browser" timestamp="1693012785412">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|