From 9b1f1bf85e5e364aa4b976d01cc603ed52ac8927 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Mon, 31 May 2021 19:01:48 +0200
Subject: [PATCH] Go go

---
 2020-11-19.md       |  2 --
 2021-03-20.md       |  3 ---
 chunking express.md | 12 ------------
 3 files changed, 17 deletions(-)

diff --git a/2020-11-19.md b/2020-11-19.md
index 2457536d2..b5133af9c 100644
--- a/2020-11-19.md
+++ b/2020-11-19.md
@@ -1,6 +1,5 @@
 # 2020-11-19
 
-<<<<<<< HEAD
 =======
 - [[daily]]
 - Review [[2020-11-18]].
@@ -11,4 +10,3 @@
 - Fill in [[social knowledge graphs]] discussion doc. skgdoc.
 - Should work on [[roam likes]]
    - Add [[logseq]], [[vimwiki]], [[org roam]].
->>>>>>> 8cbd729d8b025e0a28fbceb803de4ac12f2566c4
diff --git a/2021-03-20.md b/2021-03-20.md
index 3094845ae..446389cb6 100644
--- a/2021-03-20.md
+++ b/2021-03-20.md
@@ -26,10 +26,7 @@
 - [[count my blessings]]
 - [[web monetization]]
 - [[dumb]]
-<<<<<<< HEAD
 - [[solipsist]]
-=======
 - [[lingua franca]]
->>>>>>> b4837a834f9177c134d27a8ea7b99b2a9a5d06bf
 
 
diff --git a/chunking express.md b/chunking express.md
index ac269701b..e29eafd00 100644
--- a/chunking express.md	
+++ b/chunking express.md	
@@ -1,13 +1 @@
-<<<<<<< HEAD
-- a [[movie]]
-	- by [[wong kar wai]]
-	- one of my favourites
-	- [[go]] https://www.youtube.com/watch?v=MH38QAN80vs
-
-<<<<<<< HEAD
-https://twitter.com/flancian/status/1399002943425232902
-=======
->>>>>>> ccd3b91b49fec637a106ba636501453785014f1c
-=======
 - [[pull]] [[chungking express]]
->>>>>>> 9ffb8a237145fa8caec4e1a3fe709c6e3a02e559