From eecf6e6670a73ed8ebf5ccade7d05ea1155ecdf6 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Fri, 7 May 2021 16:49:32 +0200
Subject: [PATCH] Auto: misc.

---
 journal/2021-05-07.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/journal/2021-05-07.md b/journal/2021-05-07.md
index 6678010c1..c85f72fae 100644
--- a/journal/2021-05-07.md
+++ b/journal/2021-05-07.md
@@ -1,8 +1,5 @@
 # 2021-05-07
 
-<<<<<<< HEAD
 - [[vathek]]
-=======
 - [[ctzn]]
   - [[pleco]]
->>>>>>> 4815e363805195cb9c2c1a0214144ac2d50d30e3