vault backup: 2026-05-14 15:39:12

.obsidian/community-plugins.json

@@ -1,18 +0,0 @@
-[
-  "export-graph-view",
-  "mermaid-tools",
-  "obsidian-git",
-<<<<<<< HEAD
-  "obsidian-plantuml",
-  "pdf-plus",
-  "obsidian-tasks-plugin",
-  "tasks-calendar-wrapper",
-  "advanced-canvas"
-=======
-  "obsidian-tasks-plugin",
-  "pdf-plus",
-  "tasks-calendar-wrapper",
-  "advanced-canvas",
-  "obsidian-plantuml"
->>>>>>> origin/main
-]

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "diff",
               "title": "Diff: community-plugins.json  (Working Tree)"
             }
+          },
+          {
+            "id": "64fde9784df7e8bc",
+            "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"
@@ -156,12 +171,13 @@
             "state": {
               "type": "outline",
               "state": {
+                "file": "conflict-files-obsidian-git.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "大纲"
+              "title": "conflict-files-obsidian-git 的大纲"
             }
           },
           {
@@ -208,7 +224,7 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "2076822cdefbb8a3",
+  "active": "64fde9784df7e8bc",
   "lastOpenFiles": [
     "conflict-files-obsidian-git.md",
     "README.md",