Resolve merge conflicts - keep local plugin versions and settings

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-02-24 08:19:53 +08:00
parent 68182b70fd cd4ebb7e44
commit a2249c8d96
124 changed files with 962 additions and 187 deletions
@@ -14,12 +14,11 @@
  "highlightr-plugin",
  "obsidian-excalidraw-plugin",
  "code-styler",
-  "note-buddy",
-  "claudian",
  "calendar",
  "better-word-count",
  "table-editor-obsidian",
  "obsidian-advanced-uri",
  "advanced-canvas",
-  "obsidian-git"
+  "obsidian-git",
+  "claudian"
 ]