From 1d70c65d0239ef012bf00648c63be1649be3d54c Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 15 Jan 2022 12:56:07 +0100
Subject: [PATCH] Autopush.

---
 journal/2022-01-14.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/journal/2022-01-14.md b/journal/2022-01-14.md
index 6e8b28875..d88f55082 100644
--- a/journal/2022-01-14.md
+++ b/journal/2022-01-14.md
@@ -1,6 +1,5 @@
 # 2022-01-14
 
-<<<<<<< HEAD
 
 - [[8]]
   - [[the eightfold path]]
@@ -8,7 +7,6 @@
   - [[17]]
     - [[18 43]]
     - [[cicadas]]
-=======
 - Took the day off work :)
   - Went to [[greifensee]]: [[nänikon]] to [[uster]].
 - [[vera]] and [[neil]] amazing
@@ -18,5 +16,4 @@
 - [[push]] [[some flancias]]
   - there is [[your flancia]].
   - there is my [[flancia]].
-  - there are many [[flancias]]!
->>>>>>> ba4558a1ac33fbaa8d1a1cc4bbf88fa1a97e767e
+  - there are many [[flancias]]!
\ No newline at end of file