|
@@ -1,12 +1,18 @@
|
|
<?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="31704e56-aca5-4e2d-bea1-d331132222c4" name="Default Changelist" comment="" />
|
|
|
|
|
|
+ <list default="true" id="31704e56-aca5-4e2d-bea1-d331132222c4" 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$/historical_material.py" beforeDir="false" afterPath="$PROJECT_DIR$/historical_material.py" afterDir="false" />
|
|
|
|
+ </list>
|
|
<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" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
</component>
|
|
|
|
+ <component name="Git.Settings">
|
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
+ </component>
|
|
<component name="JupyterTrust" id="ca2d42e4-d722-44a7-b416-c78a02b293a2" />
|
|
<component name="JupyterTrust" id="ca2d42e4-d722-44a7-b416-c78a02b293a2" />
|
|
<component name="ProjectId" id="1xtcY2zgL9PgwlsfQTItYSWSoLL" />
|
|
<component name="ProjectId" id="1xtcY2zgL9PgwlsfQTItYSWSoLL" />
|
|
<component name="ProjectViewState">
|
|
<component name="ProjectViewState">
|
|
@@ -82,7 +88,8 @@
|
|
<workItem from="1631846187097" duration="1382000" />
|
|
<workItem from="1631846187097" duration="1382000" />
|
|
<workItem from="1631861458465" duration="38000" />
|
|
<workItem from="1631861458465" duration="38000" />
|
|
<workItem from="1631861519848" duration="283000" />
|
|
<workItem from="1631861519848" duration="283000" />
|
|
- <workItem from="1631861811445" duration="1237000" />
|
|
|
|
|
|
+ <workItem from="1631861811445" duration="1804000" />
|
|
|
|
+ <workItem from="1631863643828" duration="12000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
@@ -171,7 +178,7 @@
|
|
<breakpoints>
|
|
<breakpoints>
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<url>file://$PROJECT_DIR$/historical_material.py</url>
|
|
<url>file://$PROJECT_DIR$/historical_material.py</url>
|
|
- <line>201</line>
|
|
|
|
|
|
+ <line>203</line>
|
|
<option name="timeStamp" value="24" />
|
|
<option name="timeStamp" value="24" />
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
@@ -181,7 +188,7 @@
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<url>file://$PROJECT_DIR$/historical_material.py</url>
|
|
<url>file://$PROJECT_DIR$/historical_material.py</url>
|
|
- <line>202</line>
|
|
|
|
|
|
+ <line>204</line>
|
|
<option name="timeStamp" value="26" />
|
|
<option name="timeStamp" value="26" />
|
|
</line-breakpoint>
|
|
</line-breakpoint>
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|
|
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
|