vault backup: 2026-04-01 21:17:56

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "激光原理"
             }
+          },
+          {
+            "id": "6a54f33e0d4d600e",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -178,10 +193,11 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "ee6712e4bb96f904",
+  "active": "6a54f33e0d4d600e",
   "lastOpenFiles": [
-    "超级备忘/机器学习/机器视觉.md",
     "超级备忘/激光原理/激光原理.md",
+    "conflict-files-obsidian-git.md",
+    "超级备忘/机器学习/机器视觉.md",
     "超级备忘/激光原理",
     "超级备忘/机器学习/实验课.md",
     "超级备忘/课内备忘/课表.md",
@@ -198,7 +214,6 @@
     "个人日记/2026-03-09.md",
     "个人日记/2026-03-08.md",
     "超级备忘/图像处理",
-    "conflict-files-obsidian-git.md",
     "超级备忘/课内备忘/截屏2026-03-09 00.21.23.png",
     "超级备忘/光纤通信",
     "技能树/校园网/校园网通过openwrt绕过校园网多设备检测.md",