vault backup: 2026-05-26 14:44:33

.obsidian/workspace.json

@@ -44,8 +44,23 @@
               "icon": "lucide-file-text",
               "title": "2025.12六级真题第1套"
             }
+          },
+          {
+            "id": "da561db2ec7b48db",
+            "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"
@@ -205,8 +220,10 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "2ec2265d367f556d",
+  "active": "da561db2ec7b48db",
   "lastOpenFiles": [
+    "个人总纲和进度监督/英语六级/2026-05-10/2025.12六级真题第1套.pdf",
+    "conflict-files-obsidian-git.md",
     "个人总纲和进度监督/英语六级/2026-05-10/2025.12六级听力第1套.mp3",
     "个人总纲和进度监督/英语六级/2026-05-13/2026-05-13.md",
     "个人总纲和进度监督/英语六级/2026-05-12/2026-05-12.md",
@@ -229,8 +246,6 @@
     "个人总纲和进度监督/英语六级/2026-05-13/file_other/2025.12六级真题第3套 2.webp",
     "个人总纲和进度监督/英语六级/2026-05-13/file_other/2025.12六级真题第3套 1.webp",
     "个人总纲和进度监督/英语六级/2026-05-13/file_other/2025.12六级真题第3套.webp",
-    "个人总纲和进度监督/英语六级/2026-05-13/file_other",
-    "conflict-files-obsidian-git.md",
     "未命名.md",
     "个人日记/2026-05-11.md",
     "技能树/fireceawl api.md",