From db21bf77ac8eb12940cf5d79b67138bb3ccc213a Mon Sep 17 00:00:00 2001
From: ladeng07 <40017222+ladeng07@users.noreply.github.com>
Date: Sun, 17 Apr 2022 16:58:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 68 ++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e06d154..c076efb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -19,23 +19,8 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b4a8991b-db81-45ad-a784-7019e69d46a8" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/IT_Show.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/IT_Show.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="b4a8991b-db81-45ad-a784-7019e69d46a8" name="Default Changelist" comment="终于合并了55555">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ITShowPlatform/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/settings.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ITShowPlatform/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/ITShowPlatform/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/IT_Show/__init__.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/IT_Show/asgi.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/IT_Show/settings.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/IT_Show/urls.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/IT_Show/wsgi.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/history/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/history/urls.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/it/__init__.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/it/asgi.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/it/settings.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/it/urls.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/it/wsgi.py" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -48,6 +33,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GithubDefaultAccount">
+    <option name="defaultAccountId" value="1c1d4962-1136-4082-abce-379fd2efcfaa" />
+  </component>
   <component name="GithubPullRequestsUISettings">
     <option name="hiddenUrls">
       <set>
@@ -64,7 +52,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/Django/IT_todo/IT_todo/urls.py" />
+    <property name="last_opened_file_path" value="$USER_HOME$/Desktop/Django/ITShowPlatform" />
     <property name="restartRequiresConfirmation" value="false" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
@@ -106,8 +94,16 @@
       <workItem from="1649741931289" duration="319000" />
       <workItem from="1649742318293" duration="171000" />
       <workItem from="1649742661732" duration="1951000" />
-      <workItem from="1650181685676" duration="1020000" />
+      <workItem from="1650181685676" duration="2318000" />
     </task>
+    <task id="LOCAL-00001" summary="终于合并了55555">
+      <created>1650182907589</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1650182907589</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -124,31 +120,47 @@
       </map>
     </option>
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="终于合并了55555" />
+    <option name="LAST_COMMIT_MESSAGE" value="终于合并了55555" />
+  </component>
   <component name="WindowStateProjectService">
-    <state x="549" y="187" key="FileChooserDialogImpl" timestamp="1650182514476">
+    <state x="549" y="187" key="FileChooserDialogImpl" timestamp="1650184026562">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
-    <state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1650182514476" />
-    <state width="1493" height="217" key="GridCell.Tab.0.bottom" timestamp="1650182676459">
+    <state x="549" y="187" key="FileChooserDialogImpl/0.0.1536.864@0.0.1536.864" timestamp="1650184026562" />
+    <state x="615" y="342" key="Github.Dialog.Accounts.Choose" timestamp="1650182935920">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
-    <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1650182676459" />
-    <state width="1493" height="217" key="GridCell.Tab.0.center" timestamp="1650182676458">
+    <state x="615" y="342" key="Github.Dialog.Accounts.Choose/0.0.1536.864@0.0.1536.864" timestamp="1650182935920" />
+    <state width="1493" height="217" key="GridCell.Tab.0.bottom" timestamp="1650184028740">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
-    <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1650182676458" />
-    <state width="1493" height="217" key="GridCell.Tab.0.left" timestamp="1650182676458">
+    <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.864@0.0.1536.864" timestamp="1650184028740" />
+    <state width="1493" height="217" key="GridCell.Tab.0.center" timestamp="1650184028739">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
-    <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1650182676458" />
-    <state width="1493" height="217" key="GridCell.Tab.0.right" timestamp="1650182676459">
+    <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.864@0.0.1536.864" timestamp="1650184028739" />
+    <state width="1493" height="217" key="GridCell.Tab.0.left" timestamp="1650184028739">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
-    <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1650182676459" />
+    <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.864@0.0.1536.864" timestamp="1650184028739" />
+    <state width="1493" height="217" key="GridCell.Tab.0.right" timestamp="1650184028740">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.864@0.0.1536.864" timestamp="1650184028740" />
     <state x="270" y="76" key="SettingsEditor" timestamp="1650182715520">
       <screen x="0" y="0" width="1536" height="864" />
     </state>
     <state x="270" y="76" key="SettingsEditor/0.0.1536.864@0.0.1536.864" timestamp="1650182715520" />
+    <state x="361" y="161" key="Vcs.Push.Dialog.v2" timestamp="1650182928068">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="361" y="161" key="Vcs.Push.Dialog.v2/0.0.1536.864@0.0.1536.864" timestamp="1650182928068" />
+    <state x="524" y="62" key="git4idea.branch.GitSmartOperationDialog" timestamp="1650183587250">
+      <screen x="0" y="0" width="1536" height="864" />
+    </state>
+    <state x="524" y="62" key="git4idea.branch.GitSmartOperationDialog/0.0.1536.864@0.0.1536.864" timestamp="1650183587250" />
     <state x="431" y="181" width="672" height="678" key="search.everywhere.popup" timestamp="1649743958455">
       <screen x="0" y="0" width="1536" height="864" />
     </state>