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>
26 lines
500 B
JSON
26 lines
500 B
JSON
[
|
|
"cm-chs-patch",
|
|
"templater-obsidian",
|
|
"obsidian-tasks-plugin",
|
|
"obsidian-style-settings",
|
|
"quickadd",
|
|
"any-block",
|
|
"obsidian-opencode",
|
|
"opencode-obsidian",
|
|
"omnisearch",
|
|
"obsidian-local-rest-api",
|
|
"obsidian-kanban",
|
|
"obsidian-icon-folder",
|
|
"highlightr-plugin",
|
|
"obsidian-git",
|
|
"obsidian-excalidraw-plugin",
|
|
"code-styler",
|
|
"note-buddy",
|
|
"claudian",
|
|
"calendar",
|
|
"better-word-count",
|
|
"table-editor-obsidian",
|
|
"obsidian-advanced-uri",
|
|
"advanced-canvas"
|
|
]
|