From fefb26e42bb83368bd960a2a03fea7d071d5f305 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Tue, 12 Dec 2023 22:19:10 +0100
Subject: [PATCH] autopushed

---
 journal/2023-12-12.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/journal/2023-12-12.md b/journal/2023-12-12.md
index 507bc9f20..b551cbcfc 100644
--- a/journal/2023-12-12.md
+++ b/journal/2023-12-12.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - [[Bettwanzen]] inspection finally came and results were relatively positive:
   - These are [[bed bugs]] indeed.
   - And, as I was hoping, they are only in the main bedroom -- haven't spread to the guest room where I've been sleeping or anywhere else it seems \o/
@@ -16,7 +15,5 @@
   - and the descendants of [[Pinafore]], like [[Enafore]]
   - and [[Phanpy]]
 - [[7]]
-=======
 - [[december adventure]]:
   - [[new style pulls]] for social media.
->>>>>>> 8a15d6d9054b02ecce3a9d195ad6fbff584db0f2