From e112122aad4e3674d595bd89fcbec5733cdaa942 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 10 Oct 2021 14:40:00 +0200
Subject: [PATCH] Default commit message, part of an automated flow.

---
 journal/2021-10-01.md | 4 ----
 quick fix.md          | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 quick fix.md

diff --git a/journal/2021-10-01.md b/journal/2021-10-01.md
index a985a5972..c82990b2b 100644
--- a/journal/2021-10-01.md
+++ b/journal/2021-10-01.md
@@ -1,8 +1,4 @@
 # 2021-10-01
 
-<<<<<<< HEAD
 - [[october]]
   - [[october 2021]]
-=======
-- [[october 2021]]
->>>>>>> 4262580707738a0b1b67413accc70af7b038a91c
diff --git a/quick fix.md b/quick fix.md
new file mode 100644
index 000000000..ab46f0585
--- /dev/null
+++ b/quick fix.md	
@@ -0,0 +1,4 @@
+# quick fix
+
+- [[2021-10-10]] /journals looks a bit wonky, there's an extra space at the top, I'll fix that now to get started.
+