From 527809f10e382f57b0ae5d52dc83ff0a2c02cc1f Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Wed, 7 Aug 2024 00:26:08 +0200
Subject: [PATCH] Merge, merge, merge! As we fork we'll merge!

---
 journal/2024-07-20.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/journal/2024-07-20.md b/journal/2024-07-20.md
index 9d661b73c..af17773a5 100644
--- a/journal/2024-07-20.md
+++ b/journal/2024-07-20.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - [[agora development]]:
   - Fix some quirks?
     - Take e.g. [[2024-07-20]]:
@@ -10,7 +9,6 @@
     - Take e.g. [[zine]]
       - [ ] It should transclude the whole of [[agua para los sedientos]], meaning the push should work.
 - I intend to make it to [[Flancia Meet]] around 10AM UTC today.
-=======
 - [[zine]]
 - [[agora]]
   - I thought about 7:
@@ -26,6 +24,5 @@
 - I read about [[Thalassemia]]
 - [[Bryce Huebner]]
 - [[LM Studio]]
-- [[skreutzer]] 
+- [[skreutzer]]
 - [[sensecraft]]
->>>>>>> c88129cac9b3765c737d5617b7b3b9a95256283b