From 68a51880e2e9f465c73fcd063b317a2a69d404db Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 10 Dec 2021 20:33:05 +0100
Subject: [PATCH] Autopush.

---
 journal/2021-12-10.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/journal/2021-12-10.md b/journal/2021-12-10.md
index 2b748d8b4..2fa603921 100644
--- a/journal/2021-12-10.md
+++ b/journal/2021-12-10.md
@@ -1,7 +1,5 @@
 # 2021-12-10
 
-<<<<<<< HEAD
-- [[solve poverty]]
-=======
 - [[sophia xu]]
->>>>>>> e21e88c7603ba05258677ff3894a98fa930c6b52
+- [[the shape of my heart]]
+- [[solve poverty]]