From 0ea4e7218f2eb3e0fb95cd5bddc404fec907191e Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 21 Nov 2021 10:14:57 +0100
Subject: [PATCH 1/2] Autopush.

---
 journal/2021-11-21.md | 3 +++
 meitei.md             | 6 ++++++
 2 files changed, 9 insertions(+)
 create mode 100644 journal/2021-11-21.md
 create mode 100644 meitei.md

diff --git a/journal/2021-11-21.md b/journal/2021-11-21.md
new file mode 100644
index 000000000..f6f667576
--- /dev/null
+++ b/journal/2021-11-21.md
@@ -0,0 +1,3 @@
+# 2021-11-21
+
+- [[meitei]]
\ No newline at end of file
diff --git a/meitei.md b/meitei.md
new file mode 100644
index 000000000..4bd6e7358
--- /dev/null
+++ b/meitei.md
@@ -0,0 +1,6 @@
+# meitei
+
+- a [[person]].
+  - [[artist]] [[musician]] [[japanese]]
+  - [[spotify]] https://open.spotify.com/artist/5TS4DIOBGgEE6ysYh7yuii?si=3m756mEpRDG-ttSbB3GVpw
+

From bc1496809c2604d7f364d5588b0dfcc0cee95530 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 21 Nov 2021 10:15:26 +0100
Subject: [PATCH 2/2] Autopush.

---
 journal/2021-11-21.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/journal/2021-11-21.md b/journal/2021-11-21.md
index 7b083cdbd..b58e54880 100644
--- a/journal/2021-11-21.md
+++ b/journal/2021-11-21.md
@@ -1,8 +1,6 @@
 # 2021-11-21
 
-<<<<<<< HEAD
 - [[meitei]]
-=======
 - [[revolution]]
 - [[do]]
   - [[agora bot]]
@@ -18,6 +16,4 @@
   - [[write]]
     - [[meditation practice]]
       - [ ] post in https://twitter.com/flancian/status/1460668561974771718
-    - [[building bridges]]
-
->>>>>>> 4f37fb6ecac546a3e031e26e1d9e87c4c16ae8e0
+    - [[building bridges]]
\ No newline at end of file