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>
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>