vault backup: 2026-05-12 00:48:54

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "diff",
               "title": "Diff: 2026-05-10  (Working Tree)"
             }
+          },
+          {
+            "id": "7610eada442042d2",
+            "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"
@@ -180,14 +195,16 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "bc07dc427c0ed51e",
+  "active": "7610eada442042d2",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "个人总纲和进度监督/英语六级/2026-05-11/2026-05-11.md",
+    "个人总纲和进度监督/英语六级/2026-05-11",
     "技能树/fireceawl api.md",
     "未命名.md",
     "个人日记/毛选摘录/《毛泽东选集》（毛选1-7：原版五卷 静火 赤旗 草堂） (毛泽东) (Z-Library).pdf",
     "个人日记/2026-05-11.md",
     "个人总纲和进度监督/英语六级/2026-05-10/2026-05-10.md",
-    "conflict-files-obsidian-git.md",
     "个人总纲和进度监督/DEADLINE.md",
     "个人总纲和进度监督/英语六级/week1/example.md",
     "个人总纲和进度监督/英语六级/week1",
@@ -202,7 +219,6 @@
     "个人总纲和进度监督/英语六级",
     "个人日记/毛选摘录/毛选摘录.md",
     "零碎的知识/win11激活.md",
-    "个人日记/毛选摘录",
     "个人日记/未命名.md",
     "个人日记/2026.3.8.md",
     "个人日记/2026-03-09.md",
@@ -223,7 +239,6 @@
     "考研/math/009_第8讲.md",
     "考研/math/015_第13讲.md",
     "考研/math/018_第17讲.md",
-    "考研/math/020_第18讲.md",
     "27张宇基础30讲高数 2.webp",
     "27张宇基础30讲高数 1.webp",
     "27张宇基础30讲高数.webp",