|
@@ -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/view/article_item/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_item/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_comment/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_comment/index.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
@@ -182,7 +182,7 @@
|
|
|
<workItem from="1660697982291" duration="9650000" />
|
|
|
<workItem from="1660730926670" duration="1018000" />
|
|
|
<workItem from="1660783282150" duration="17421000" />
|
|
|
- <workItem from="1660870368036" duration="12320000" />
|
|
|
+ <workItem from="1660870368036" duration="12612000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -238,10 +238,10 @@
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
<state x="1336" y="460" key="com.jetbrains.php.test.PhpNewTestDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1659060797945" />
|
|
|
- <state x="1058" y="441" width="617" height="490" key="find.popup" timestamp="1660362836071">
|
|
|
+ <state x="1058" y="441" width="617" height="490" key="find.popup" timestamp="1660893809255">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|
|
|
- <state x="1058" y="441" width="617" height="490" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1660362836071" />
|
|
|
+ <state x="1058" y="441" width="617" height="490" key="find.popup/0.0.2560.1400@0.0.2560.1400" timestamp="1660893809255" />
|
|
|
<state x="1237" y="367" width="672" height="678" key="search.everywhere.popup" timestamp="1660804167284">
|
|
|
<screen x="0" y="0" width="2560" height="1400" />
|
|
|
</state>
|