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
parent 68182b70fd cd4ebb7e44
commit a2249c8d96
124 changed files with 962 additions and 187 deletions
@@ -75,19 +75,22 @@ git push
 # 2026-01-06

 ## Capture
- 
+-

 ## Questions
- 
+-

 ## Insights
- 
+-

 ## Connections
- 
+-

 ## For Tomorrow
- 
+-
+
+---
+← [[2026-01-05]] | [[2026-01-07]] →
 ```

 **中文模板**（手动应用）：
@@ -1,24 +1,26 @@
-# {{date:YYYY-MM-DD}}
+# <% tp.date.now("YYYY-MM-DD") %>

 ## Capture
 <!-- Quick thoughts, links, ideas throughout the day -->
- 
+-

 ## Questions
 <!-- What am I curious about today? -->
- 
+-

 ## Insights
 <!-- What did I learn or realize? -->
- 
+-

 ## Connections
 <!-- Links to other notes or ideas -->
- 
+-

 ## For Tomorrow
 <!-- What needs follow-up? -->
- 
+-

 ---
+← [[<% tp.date.yesterday("YYYY-MM-DD") %>]] | [[<% tp.date.tomorrow("YYYY-MM-DD") %>]] →
+
 *End of day: Ask Claude Code to review and find connections*