vault backup: 2026-05-14 15:37:21

.obsidian/community-plugins.json

@@ -2,9 +2,17 @@
   "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

@@ -11,14 +11,14 @@
             "id": "b0ba3684f585064f",
             "type": "leaf",
             "state": {
-              "type": "markdown",
+              "type": "split-diff-view",
               "state": {
-                "file": "README.md",
-                "mode": "source",
-                "source": false
+                "aFile": ".obsidian/community-plugins.json",
+                "bFile": ".obsidian/community-plugins.json",
+                "aRef": ""
               },
-              "icon": "lucide-file",
-              "title": "README"
+              "icon": "diff",
+              "title": "Diff: community-plugins.json  (Working Tree)"
             }
           }
         ]
@@ -156,13 +156,12 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "README.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "README 的大纲"
+              "title": "大纲"
             }
           },
           {
@@ -209,13 +208,13 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "b0ba3684f585064f",
+  "active": "2076822cdefbb8a3",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "README.md",
     "未命名.canvas",
     "诀别书钢琴谱.pdf",
     "动画.gif",
-    "README.md",
-    "部门五月份任务规划.md",
-    "conflict-files-obsidian-git.md"
+    "部门五月份任务规划.md"
   ]
 }