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

gustavo todo.md

@@ -0,0 +1,4 @@
+# gustavo todo
+
+- [[go]] https://docs.google.com/document/d/1xzu0xHCjPb9ncdLOCF6d-ZdR4TtG_szMcQ6awV_9Pgw/edit
+

journal/2021-12-29.md

@@ -1,10 +1,12 @@
 # 2021-12-29
 
+- [[gustavo todo]]
 - [[test]]
   - <a href="https://twitter.com/flancian/status/1476126755807191047">test of new twitter embed code when the source has a proper a href</a>
   - https://twitter.com/flancian/status/1476126755807191047
 - [ ] work
 - [ ] do
+<<<<<<< HEAD
 - [[commons]]
   - [[knowledge commons]]
     - [[agora]]
@@ -12,4 +14,6 @@
         - [[commons]]
 - [[later]]
   - [[silly]]
-    - [[the ministry of silly walks]]
+    - [[the ministry of silly walks]]
+=======
+>>>>>>> 99f978cbca1895e8bc83d3f4171b706c0e3038f2

virginia astley.md

@@ -1,6 +1,7 @@
 # virginia astley
 
 - a [[person]].
-  - [[musician]]
+  - [[musician]] 
+    - [[ambient]]
   - [[from gardens where we feel secure]]