|
@ -1,9 +1,7 @@ |
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
<project version="4"> |
|
|
<project version="4"> |
|
|
<component name="ChangeListManager"> |
|
|
<component name="ChangeListManager"> |
|
|
<list default="true" id="ff19f7bd-a249-4c52-a218-56cff65ae900" name="Changes" comment="ubung2"> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
|
|
|
</list> |
|
|
|
|
|
|
|
|
<list default="true" id="ff19f7bd-a249-4c52-a218-56cff65ae900" name="Changes" comment="ubung2" /> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
|
@ -54,7 +52,7 @@ |
|
|
<workItem from="1667978641231" duration="1543000" /> |
|
|
<workItem from="1667978641231" duration="1543000" /> |
|
|
<workItem from="1667980824243" duration="1298000" /> |
|
|
<workItem from="1667980824243" duration="1298000" /> |
|
|
<workItem from="1667983119468" duration="302000" /> |
|
|
<workItem from="1667983119468" duration="302000" /> |
|
|
<workItem from="1667983506078" duration="991000" /> |
|
|
|
|
|
|
|
|
<workItem from="1667983506078" duration="1330000" /> |
|
|
</task> |
|
|
</task> |
|
|
<task id="LOCAL-00001" summary="merge conflicts"> |
|
|
<task id="LOCAL-00001" summary="merge conflicts"> |
|
|
<created>1667935991746</created> |
|
|
<created>1667935991746</created> |
|
@ -70,7 +68,14 @@ |
|
|
<option name="project" value="LOCAL" /> |
|
|
<option name="project" value="LOCAL" /> |
|
|
<updated>1667984194096</updated> |
|
|
<updated>1667984194096</updated> |
|
|
</task> |
|
|
</task> |
|
|
<option name="localTasksCounter" value="3" /> |
|
|
|
|
|
|
|
|
<task id="LOCAL-00003" summary="ubung2"> |
|
|
|
|
|
<created>1668031179750</created> |
|
|
|
|
|
<option name="number" value="00003" /> |
|
|
|
|
|
<option name="presentableId" value="LOCAL-00003" /> |
|
|
|
|
|
<option name="project" value="LOCAL" /> |
|
|
|
|
|
<updated>1668031179750</updated> |
|
|
|
|
|
</task> |
|
|
|
|
|
<option name="localTasksCounter" value="4" /> |
|
|
<servers /> |
|
|
<servers /> |
|
|
</component> |
|
|
</component> |
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|
<component name="TypeScriptGeneratedFilesManager"> |
|
|