windy/my-vault
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote changes and resolve plugin conflicts

Browse Source 
Resolved conflicts in:
- .obsidian/community-plugins.json: Combined plugin lists from both branches
- .obsidian/plugins/obsidian-excalidraw-plugin/manifest.json: Kept identical content

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
windyboy
2026-01-31 08:42:21 +08:00
co-authored by Claude Sonnet 4.5
parent b83116eb26 bf57be8355
commit 9cf2428793
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.obsidian/community-plugins.json
Vendored
-5
View File
@@ -20,15 +20,10 @@
"obsidian-mind-map", "obsidian-mind-map",
"cm-chs-patch", "cm-chs-patch",
"quickadd", "quickadd",
<<<<<<< HEAD
"highlightr-plugin",
"obsidian-git"
=======
"any-block", "any-block",
"obsidian-opencode", "obsidian-opencode",
"opencode-obsidian", "opencode-obsidian",
"highlightr-plugin", "highlightr-plugin",
"code-styler", "code-styler",
"note-buddy" "note-buddy"
>>>>>>> main/main
] ]