From dc00ffc34bb683cdb8f23bd7491e4ceefb53c06d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 13:35:56 +0800
Subject: [PATCH] build

---
 .idea/workspace.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 341caf23..e81ee7eb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,8 +13,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="270" column="12" lean-forward="true" selection-start-line="270" selection-start-column="12" selection-end-line="270" selection-end-column="12" />
+            <state relative-caret-position="206">
+              <caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -26,8 +26,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>创建</find>
-      <find>.map((item,key)=&gt;{</find>
       <find>.map((item,key)</find>
       <find>评论成</find>
       <find>没有</find>
@@ -56,6 +54,8 @@
       <find>TextArea</find>
       <find>body</find>
       <find>该合并请求可以进行自动合并操作</find>
+      <find>title</find>
+      <find>changbodypr</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -195,12 +195,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="9777000" />
+      <workItem from="1585732642767" duration="10719000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="62313000" />
+    <option name="totallyTimeSpent" value="63255000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -218,8 +218,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.45903614" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.23855421" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.48433736" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -725,8 +725,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="270" column="12" lean-forward="true" selection-start-line="270" selection-start-column="12" selection-end-line="270" selection-end-column="12" />
+        <state relative-caret-position="206">
+          <caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>