同步前提交

fk101/wb_new_ui/.objs/workspace.json

@@ -1,39 +1,23 @@
 {
-<<<<<<< HEAD
   "libview.firstColumnWidth": 413,
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://27vd145bp2bz6s",
-    "ui://27vd145bh1uu30"
-=======
-  "libview.firstColumnWidth": 356,
-  "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://27vd145bhxjc7i4q",
-    "ui://kplym8mus9wxa",
-    "ui://fnuxqeflnrnod",
-    "ui://c7j2rnvqtpf02f",
-    "ui://y8prev1ms9wx7",
-    "ui://3z9lj55vjokmft",
-    "ui://4skil1l6piv91ny",
-    "ui://niy3ldiwl9mny",
-    "ui://niy3ldiwl9mn19",
-    "ui://9n9stu2eprgzei",
-    "ui://9n9stu2eprgzef"
->>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc
+    "ui://27vd145bh1uu30",
+    "ui://m7iejg46jgh8hwv"
   ],
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-<<<<<<< HEAD
-  "doc.activeDoc": "ui://27vd145bh1uu30",
-=======
-  "doc.activeDoc": "ui://9n9stu2eprgzef",
->>>>>>> 368adb556d7cebce181e75c91dbfa87ec76419fc
+  "doc.activeDoc": "ui://m7iejg46jgh8hwv",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
-    "/"
+    "/",
+    "m7iejg46",
+    "/",
+    "m7iejg46",
+    "/mgr/"
   ],
   "snapToGrid": true,
   "backgroundColor": 6710886,