From 84f7e999c55865d1fdcd44a195b4ed4035aad949 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Thu, 23 Dec 2021 14:58:14 +0100
Subject: [PATCH] Autopush.

---
 journal/2021-12-22.md | 4 +---
 journal/2021-12-23.md | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 journal/2021-12-23.md

diff --git a/journal/2021-12-22.md b/journal/2021-12-22.md
index d8b85424d..3a41940fb 100644
--- a/journal/2021-12-22.md
+++ b/journal/2021-12-22.md
@@ -12,9 +12,7 @@
 - [[berni]]
   - [[doug macleod]]
     - [[come to find]]
-<<<<<<< HEAD
 - [[everything is a remix]]
   - [[all musicians are connected]]
-=======
 - [[stoa sync]]
->>>>>>> 1b9e05190889367dcdd171af7f26c07f44245f5a
+- [[yt-dlp]] is great
\ No newline at end of file
diff --git a/journal/2021-12-23.md b/journal/2021-12-23.md
new file mode 100644
index 000000000..90c4545dc
--- /dev/null
+++ b/journal/2021-12-23.md
@@ -0,0 +1,5 @@
+# 2021-12-23
+
+- [[agora]]
+  - fixed the layout of the auto pulled search section (it had a stray [[br]] causing an awkward gap)
+  - merged [[vera]]'s fix for fedwiki importer interferring with /latest (thanks!)
\ No newline at end of file