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>
Resources
Reference materials and topics of interest.