From de5d0e15a292a6aa0161b86b73f12bb7cdbeda6c Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 22 Jan 2022 19:29:27 +0100
Subject: [PATCH] Autopush.

---
 friends of god.md     |  2 ++
 journal/2022-01-22.md | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 friends of god.md

diff --git a/friends of god.md b/friends of god.md
new file mode 100644
index 000000000..f28331937
--- /dev/null
+++ b/friends of god.md	
@@ -0,0 +1,2 @@
+# friends of god
+
diff --git a/journal/2022-01-22.md b/journal/2022-01-22.md
index bdf3a6557..4cd4630bb 100644
--- a/journal/2022-01-22.md
+++ b/journal/2022-01-22.md
@@ -1,11 +1,10 @@
 # 2022-01-22
 
-<<<<<<< HEAD
-- [[rhineland mystics]]
-  - led to [[friends of god]]
-=======
-- [[flancia meet]]
 - [[project underlay]]
 - [[bouncepaw]]
   - [[cyberrachel]]
->>>>>>> 7e3c91a2eafcc36619514492a1d4629351d26bae
+- [[rhineland mystics]]
+  - led to [[friends of god]]
+- [[flancia]]
+  - [[flancia meet]]
+