Merge remote changes with local updates - resolve plugin conflicts

2026-01-21 10:04:59 +08:00
parent f3576006fd
commit 2a20569162
19 changed files with 51409 additions and 24423 deletions
@@ -2,16 +2,20 @@
  "claudian",
  "obsidian-local-rest-api",
  "table-editor-obsidian",
+  "obsidian-git",
  "templater-obsidian",
  "obsidian-kanban",
  "obsidian-icon-folder",
  "omnisearch",
  "obsidian-advanced-uri",
+  "advanced-canvas",
  "obsidian-advanced-codeblock",
-  "better-word-count",
+  "better-word-counted",
  "obsidian-excalidraw-plugin",
  "obsidian-mind-map",
  "cm-chs-patch",
  "quickadd",
-  "highlightr-plugin"
+  "highlightr-plugin",
+  "any-block",
+  "obsidian-opencode"
 ]