From 693ea51835d0f5068144037f2ab6657c8b0c92bd Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Wed, 16 Feb 2022 16:35:58 +0100
Subject: [PATCH] merge

---
 journal/2022_02_16.md | 5 +----
 quiero ser pirata.md  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/journal/2022_02_16.md b/journal/2022_02_16.md
index 862a0b503..0f2033831 100644
--- a/journal/2022_02_16.md
+++ b/journal/2022_02_16.md
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
 - [[partido interdimensional pirata]]
--
-=======
 - #push [[logseq]]
 	- I keep pressing [[g t]] to [[go today]] but it actually means [[go tomorrow]]
 	- [[g p]] for [[go previous]] fixes it :)
->>>>>>> d12a23f1972745fcf02a0e0c7da67f77174bfd48
+	  >>>>>>> d12a23f1972745fcf02a0e0c7da67f77174bfd48
\ No newline at end of file
diff --git a/quiero ser pirata.md b/quiero ser pirata.md
index 150d838a9..3cf20d57b 100644
--- a/quiero ser pirata.md	
+++ b/quiero ser pirata.md	
@@ -1 +1 @@
-- #go https://utopia.partidopirata.com.ar/quiero_ser_pirata.html
\ No newline at end of file
+-
\ No newline at end of file