From 00d5a0f3dc51a215a82d2d84eb7696dee52ed6d4 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Mon, 31 Jan 2022 09:09:53 +0100
Subject: [PATCH] merge

---
 journal/.2022-01-29.md.swp | Bin 4096 -> 0 bytes
 journal/2022-01-29.md      |   7 -------
 2 files changed, 7 deletions(-)
 delete mode 100644 journal/.2022-01-29.md.swp

diff --git a/journal/.2022-01-29.md.swp b/journal/.2022-01-29.md.swp
deleted file mode 100644
index 6c63d5859330a261889abb730e7f331e523b8107..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+u+TGN00IF92CbRj6Mb2~G4!)CGNk1s<|St)=7FT}fxP_UlA`?Fe0*v^
za&<5R_0toJQd0Buv+_%e@)C3OjSP&8bPWu3jV$$YQwW(dDnA+mqai?Y2$Ytj>00oH
y8XFlJfb=RWDJlpHg_3N{sD{xH7!85Z5Eu=C(GVC7fzc2c4S~@R7!84;8v+1qD;;(K

diff --git a/journal/2022-01-29.md b/journal/2022-01-29.md
index 180bab433..4b2a1785f 100644
--- a/journal/2022-01-29.md
+++ b/journal/2022-01-29.md
@@ -7,10 +7,7 @@
 		- #push [[anchors]]
 			- I'd been thining about anchors due to [[obsidian block anchors]] and the topic came up again today; [[bouncepaw]] is thinking about many of the same things. We decided to try to work on [[anchors]] together; try to agree on shared conventions.
 			- [[anchors]] for me generalize to the problem of transmitting [[context]], [[scope]]. I've been exploring these problems with [[push]] and [[pull]].
-<<<<<<< HEAD
-=======
 	- caught up with [[metasj]] in the evening too, about the [[commons]] and [[shared pools]].
->>>>>>> c428209fb798d57b0a5999d9c4507065a2e45d86
 - [[agora discuss]]
 	- #push [[hubs]]
 		- [[mozilla hubs]]
@@ -24,10 +21,7 @@
 	- [x] [[cleanup]]
 	- [x] [[chat]]
 	- [x] [[chat]]
-<<<<<<< HEAD
-	- [ ] [[matrix bot]]
 	- [ ] [[yoga]]
-=======
 	- [x] [[matrix bot]]
 		- took a break, see above :)
 		- with ten minutes left, let's see...
@@ -45,4 +39,3 @@
 					- based it on https://github.com/TomCasavant/RedditMaubot which is a bit of a joke bot, but as an example it was good enough ;) and MIT licensed
 					- in its own git repo for now, might just move all code to [[agora bridge]] so it coexists with social media bots though?
 - we bought a lot of chocolate today to bring as gift to family and friends :)
->>>>>>> c428209fb798d57b0a5999d9c4507065a2e45d86