vault backup: 2026-05-11 16:34:20

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "2026-05-10"
             }
+          },
+          {
+            "id": "934a2538ed9388e6",
+            "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,8 +195,11 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "bc07dc427c0ed51e",
+  "active": "934a2538ed9388e6",
   "lastOpenFiles": [
+    "个人总纲和进度监督/英语六级/2026-05-10/2026-05-10.md",
+    "conflict-files-obsidian-git.md",
+    "技能树/fireceawl api.md",
     "个人总纲和进度监督/DEADLINE.md",
     "个人总纲和进度监督/英语六级/week1/example.md",
     "个人总纲和进度监督/英语六级/week1",
@@ -189,7 +207,6 @@
     "个人总纲和进度监督/英语六级/2026-05-10/file_other/2025.12六级真题第1套.webp",
     "个人总纲和进度监督/英语六级/2026-05-10/file_other/2025.12六级真题第1套 1.webp",
     "个人总纲和进度监督/英语六级/2026-05-10/file_other",
-    "个人总纲和进度监督/英语六级/2026-05-10/2026-05-10.md",
     "个人总纲和进度监督/英语六级/2026-05-10/2025.12英语六级解析第1套.pdf",
     "个人总纲和进度监督/英语六级/2026-05-10/2025.12六级真题第1套.pdf",
     "个人总纲和进度监督/英语六级/2026-05-10/2025.12六级听力第1套.mp3",
@@ -202,7 +219,6 @@
     "个人日记/未命名.md",
     "个人日记/2026.3.8.md",
     "个人日记/2026-03-09.md",
-    "conflict-files-obsidian-git.md",
     "零碎的知识/手机tmux.md",
     "零碎的知识/clould code.md",
     "零碎的知识/git备忘.md",
@@ -223,7 +239,6 @@
     "考研/math/020_第18讲.md",
     "考研/math/019_第17讲.md",
     "考研/math/017_第15讲.md",
-    "考研/math/016_第14讲.md",
     "27张宇基础30讲高数 2.webp",
     "27张宇基础30讲高数 1.webp",
     "27张宇基础30讲高数.webp",

技能树/fireceawl api.md

@@ -0,0 +1 @@
+fc-0d4620716cae4d8fb31aa29405a01fd2