Merge branch 'origin/main' into main
Resolved conflicts in: - .claude/settings.json (kept local permissions) - .obsidian/community-plugins.json (merged both plugin lists) - .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json (kept newer version 2.20.2) - .obsidian/plugins/claudian/main.js (used simpler dependency paths) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Vendored
+16
-19
@@ -1,28 +1,25 @@
|
||||
[
|
||||
"claudian",
|
||||
"obsidian-local-rest-api",
|
||||
"table-editor-obsidian",
|
||||
"obsidian-git",
|
||||
"cm-chs-patch",
|
||||
"templater-obsidian",
|
||||
"obsidian-tasks-plugin",
|
||||
"calendar",
|
||||
"obsidian-kanban",
|
||||
"obsidian-style-settings",
|
||||
"obsidian-icon-folder",
|
||||
"omnisearch",
|
||||
"copilot",
|
||||
"easy-typing-obsidian",
|
||||
"obsidian-advanced-uri",
|
||||
"advanced-canvas",
|
||||
"better-word-count",
|
||||
"dataview",
|
||||
"obsidian-excalidraw-plugin",
|
||||
"obsidian-mind-map",
|
||||
"cm-chs-patch",
|
||||
"quickadd",
|
||||
"any-block",
|
||||
"obsidian-opencode",
|
||||
"opencode-obsidian",
|
||||
"omnisearch",
|
||||
"obsidian-local-rest-api",
|
||||
"obsidian-kanban",
|
||||
"obsidian-icon-folder",
|
||||
"highlightr-plugin",
|
||||
"code-styler"
|
||||
]
|
||||
"obsidian-git",
|
||||
"obsidian-excalidraw-plugin",
|
||||
"code-styler",
|
||||
"note-buddy",
|
||||
"claudian",
|
||||
"calendar",
|
||||
"better-word-count",
|
||||
"table-editor-obsidian",
|
||||
"obsidian-advanced-uri",
|
||||
"advanced-canvas"
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user