 windyboy
|
1e3905d304
|
vault backup: 2026-02-25 16:53:37
|
2026-02-25 16:53:37 +08:00 |
|
|
windyboyandClaude Sonnet 4.6
|
a2249c8d96
|
Resolve merge conflicts - keep local plugin versions and settings
Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
|
2026-02-24 08:19:53 +08:00 |
|
|
windyboy
|
68182b70fd
|
vault backup: 2026-02-24 07:55:02
|
2026-02-24 07:55:02 +08:00 |
|
|
windyboyandClaude Sonnet 4.5
|
e1db1b4259
|
Merge branch 'origin/main' into main
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>
|
2026-02-04 13:46:49 +08:00 |
|
|
windyboy
|
167eb9ac9c
|
vault backup: 2026-02-04 13:41:36
|
2026-02-04 13:41:36 +08:00 |
|
|
windyboy
|
b83116eb26
|
vault backup: 2026-01-31 08:25:19
|
2026-01-31 08:25:19 +08:00 |
|
|
windyboy
|
0450479e72
|
vault backup: 2026-01-31 08:24:12
|
2026-01-31 08:24:12 +08:00 |
|
|
windyboy
|
2a20569162
|
Merge remote changes with local updates - resolve plugin conflicts
|
2026-01-21 10:04:59 +08:00 |
|
|
windyboy
|
4add1512a9
|
210126
|
2026-01-21 08:46:13 +08:00 |
|
|
windyboy
|
6991f07b06
|
vault backup: 2026-01-07 18:02:26
|
2026-01-07 18:02:26 +08:00 |
|
|
windyboy
|
40f3fe3eb8
|
vault backup: 2026-01-05 14:26:17
|
2026-01-05 14:26:17 +08:00 |
|