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

journal/2022-01-14.md

@@ -1,6 +1,5 @@
 # 2022-01-14
 
-<<<<<<< HEAD
 
 - [[8]]
   - [[the eightfold path]]
@@ -8,7 +7,6 @@
   - [[17]]
     - [[18 43]]
     - [[cicadas]]
-=======
 - Took the day off work :)
   - Went to [[greifensee]]: [[nänikon]] to [[uster]].
 - [[vera]] and [[neil]] amazing
@@ -18,5 +16,4 @@
 - [[push]] [[some flancias]]
   - there is [[your flancia]].
   - there is my [[flancia]].
-  - there are many [[flancias]]!
->>>>>>> ba4558a1ac33fbaa8d1a1cc4bbf88fa1a97e767e
+  - there are many [[flancias]]!

journal/2022-01-15.md

@@ -1,3 +1,4 @@
 # 2022-01-15
 
-- [[flancia meet]]
+- [[flancia meet]]
+- [[take it easy]]

take it easy.md

@@ -2,5 +2,6 @@
 
 - a [[soundscape]].
   - [[mynoise]]
-  - [[go]] https://mynoise.net/NoiseMachines/paulNagleSequenceGenerator.php
+  - [[go]] https://mynoise.net/NoiseMachines/paulNagleSequenceGenerator.php?l=46404846414743444852&a=1&am=1
+  - [[static]] https://mynoise.net/NoiseMachines/paulNagleSequenceGenerator.php