Resolve merge conflict in workspace configuration and calendar canvas

Browse Source

- Merge mobile workspace state updates (.obsidian/workspace-mobile.json)
- Integrate February 2026 calendar canvas changes (2026년 월력형 메모형 일정(2월).canvas)
- Preserve both workspace layout and calendar event data

...

This commit is contained in:

choibk committed 2026-10-07 02:39:49 +09:00

2 parents 4639bb6afb 61b20fc817

commit 51f9e32f8e

5 files changed

+944 -935

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

2026년 월력형 메모형 일정(2월).canvas

+907 -801

File diff suppressed because it is too large. Load diff