resolve conflict

2025-01-14 15:20:39 +08:00
parent c07e1f1880
commit 04a86c8dec
3 changed files with 34 additions and 2 deletions
--- a/journals/2025_01_13.md
+++ b/journals/2025_01_13.md
@@ -1,3 +1,4 @@
 - [[人生重要概念]]
 - [[沟通的的方法]]
- [[Dan Koe]]
+- [[Dan Koe]]
+- [[使用文字的本质]]