merge

2026-08-07 06:56:19 +00:00 · 2022-02-16 16:35:58 +01:00
parent d71abc9dbd
commit 693ea51835
2 changed files with 2 additions and 5 deletions
@@ -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
@@ -1 +1 @@
- #go https://utopia.partidopirata.com.ar/quiero_ser_pirata.html
+-