diff --git a/journal/2021-12-21.md b/journal/2021-12-21.md index 9939d2e89..60f759334 100644 --- a/journal/2021-12-21.md +++ b/journal/2021-12-21.md @@ -1,5 +1,7 @@ # 2021-12-21 +- [[winter solstice]] is today! +- [[one hour for the revolution]] - [[global risk]] - [[winter solstice]] is today! - [[flancia]] @@ -20,7 +22,10 @@ - [[vital876]] == [[vital]] - [[category]] - [[categories]] +<<<<<<< HEAD - [[push]] [[2021-12-22]] - write [[perhaps naive]] - write [[the expanding circle]] - - write [[knowledge commons]] \ No newline at end of file + - write [[knowledge commons]] +======= +>>>>>>> 3c51dca78c02c1b172223462fdc7338598d32b31 diff --git a/journal/2021-12-22.md b/journal/2021-12-22.md index abde09124..7776e63ec 100644 --- a/journal/2021-12-22.md +++ b/journal/2021-12-22.md @@ -1,3 +1,15 @@ # 2021-12-22 +- [[yoga]] + - [[push]] [[yoga for social anxiety]] + - [[2021-12-21]] + - has at least one funny bit + - also the IMHO dangerous bit with downward fold + hands under feet + - today [[stress melt]] + - [[great]] +- [[gustavo]] + - [[viaje]] +- [[berni]] + - [[doug macleod]] + - [[come to find]] - [[stoa sync]] \ No newline at end of file diff --git a/stoa sync.md b/stoa sync.md index 2476358db..f6f4c11b9 100644 --- a/stoa sync.md +++ b/stoa sync.md @@ -4,4 +4,6 @@ - [[pull]] [[stoa subnodes]] [[autopull stoa]] - [[anagora]] now pulls content from the [[default stoa]] (https://doc.anagora.org) and renders it as subnodes in a node (whenever it exists). - this makes [[wikilinks]], [[go]], [[pull]], [[push]] equally well for the content you add anonymously than for that you add through your [[digital garden]]. + - [[git]] https://github.com/flancia-coop/doc.anagora.org + - [[go]]