vault backup: 2026-04-08 10:16:25

2026-04-08 10:16:25 +08:00
parent 1f375e6cf2 b498c7429f
commit 30a7036a03
1 changed files with 19 additions and 3 deletions
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -42,8 +42,23 @@
              "icon": "lucide-file",
              "title": "001_前言"
            }
+          },
+          {
+            "id": "c670444d314d2738",
+            "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"
@@ -202,10 +217,11 @@
      "pdf-plus:PDF++: Toggle auto-paste": false
    }
  },
-  "active": "3b3114a0b915d2fc",
+  "active": "c670444d314d2738",
  "lastOpenFiles": [
-    "考研/math/27张宇基础30讲高数.pdf",
    "考研/math/001_前言.md",
+    "conflict-files-obsidian-git.md",
+    "考研/math/27张宇基础30讲高数.pdf",
    "考研/math/002_第1讲.md",
    "考研/math/004_第3讲.md",
    "考研/math/009_第8讲.md",