Merge branch 'master' of github.com:flancian/garden

from gardens where we feel secure.md

@@ -2,5 +2,20 @@
 
 - an [[album]].
   - [[virginia astley]]
-  - [[go]] https://www.youtube.com/watch?v=KNYW276VxPQ
+  - [[wp]] https://en.wikipedia.org/wiki/From_Gardens_Where_We_Feel_Secure
+
+Side one ("Morning")
+
+    "With My Eyes Wide Open I'm Dreaming" – 5:43
+    "A Summer Long Since Past" – 4:36
+    "From Gardens Where We Feel Secure" – 3:59
+    "Hiding in the Ha-Ha" – 3:55
+
+Side two ("Afternoon")
+
+    "Out on the Lawn I Lie in Bed" – 5:09
+    "Too Bright for Peacocks" – 2:29
+    "Summer of Their Dreams" – 3:21
+    "When the Fields Were on Fire" – 3:25
+    "It's Too Hot to Sleep" – 5:18
 

journal/2021-12-30.md

@@ -12,6 +12,8 @@
 - [[push]] [[barón biza]]
   - [[jorge barón biza]]
   - born [[1942]]
+<<<<<<< HEAD
+=======
 - [[commons]]
   - [[knowledge commons]]
     - [[digital commons]]
@@ -22,3 +24,4 @@
     - also:
       - [[church of the simulation]]
       - [[church of earth]]
+>>>>>>> 2224e77d7613150477a3ebe6d06a653e4c9f48c4

journal/2021-12-31.md

@@ -1,5 +1,6 @@
 # 2021-12-31
 
+- [[psas]]
 - part of [[weekend 52]]
   - last day of [[2021]]
 - [[octavia butler]]
@@ -12,4 +13,12 @@
   - now if only I could make [[foam]] not take several seconds to autocomplete wikilinks :)
 - [[discord]]
   - [[please dont use discord for foss projects]]
-- [[matrix]]
+- [[matrix]]
+  - [[matrix spaces]]
+- [[flancia]]
+  - [[lady burup]]
+  - [[from gardens where we feel secure]]
+    - [[when the fields were on fire]]
+  - [[yoga]]
+    - [[yoga for new beginnings]]
+    - in [[january]] we'll [[move]]

move.md

@@ -0,0 +1,6 @@
+# move
+
+- a [[month]].
+  - of [[yoga with adriene]].
+  - [[go]] https://do.yogawithadriene.com/move
+

psas.md

@@ -0,0 +1,5 @@
+# psas
+
+- a [[list]].
+  - [[pull]] [[psa]]
+