From fc4de3a7d148e6872e1368f29118516d50045f6d Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 14 Aug 2021 14:57:49 +0200
Subject: [PATCH] Default commi t message, part of an automated flow.

---
 journal/2021-08-14.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/journal/2021-08-14.md b/journal/2021-08-14.md
index b9560b40c..277525ef0 100644
--- a/journal/2021-08-14.md
+++ b/journal/2021-08-14.md
@@ -1,9 +1,7 @@
 # 2021-08-14
 
-<<<<<<< HEAD
 - [[agora]]
   - [[agora bot]]
     - [[twitter api]]
-=======
+  - [[async search]]
 - [[caiac]]
->>>>>>> 993a11ba5a0368d11fbff1e441216fec35b4b676