From 20c810cc8c7f661593efc311142016507c84f9b3 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 5 Dec 2021 11:45:40 +0100
Subject: [PATCH 1/2] Autopush.

---
 journal/2021-12-04.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/journal/2021-12-04.md b/journal/2021-12-04.md
index 30d623bb2..393f5f5a1 100644
--- a/journal/2021-12-04.md
+++ b/journal/2021-12-04.md
@@ -1,6 +1,5 @@
 # 2021-12-04
 
-<<<<<<< HEAD
 - [[reddy2go]]
   - [[knovigator]]
     - [[metamitya]]

From adf3ffefaa29c6564a10ff78969536f57cb56822 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 5 Dec 2021 11:46:07 +0100
Subject: [PATCH 2/2] Autopush.

---
 journal/2021-12-04.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/journal/2021-12-04.md b/journal/2021-12-04.md
index d0c0f9e49..4503100ec 100644
--- a/journal/2021-12-04.md
+++ b/journal/2021-12-04.md
@@ -27,6 +27,6 @@
     - you need [[power]] to do [[good]]
     - [[@xiq]] 
     - [[parties]]
-- [[flancian]] == [[eduardo ivanec]]
+- [[flancian]] == [[eduardo]]
   - [[good is the intent to correct errors]]
   - [[flancia collective]]