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

agora project.md

@@ -0,0 +1,10 @@
+# agora project
+
+- a [[project]].
+  - by [[angle]].
+  - [[go]] https://gitlab.com/Agora-Project
+- a [[project]].
+  - by [[flancia collective]]
+  - [[go]] https://github.com/flancian/agora
+
+

family.md

@@ -0,0 +1,4 @@
+# family
+
+- I'm into downplaying gene-based affiliation whenever it's possible -- [[the expanding circle]] and all -- but I still love my family.
+

flancia meet.md

@@ -1,7 +1,7 @@
 # flancia meet
 
 - a [[space]].
-  - [[go]] https://meet.jit.si/SuccessiveUniversesTestifyYet
+  - [[go]] https://meet.jit.si/flancia-meet
     - should always point to a working VC.
 
 

journal/2022-01-07.md

@@ -3,13 +3,21 @@
 - [[patterns]]
   - [[blockchain]] https://dl.acm.org/doi/10.1145/3282308.3282312
   - [[game design]] https://www.routledge.com/Pattern-Language-for-Game-Design/Barney/p/book/9780367367725
-- [[movies]]
+- [[push]] [[movies]]
   - [[red rocket]]
   - [[licorice pizza]]
   - [[the last picture show]]
+<<<<<<< HEAD
+- [[angle]] == [[angular angel]]
+  - [[agora project]]
+=======
 - [[flancia weekly]]
 - [[push]] [[2022-01-08]]
   - [ ] add video stoa to the Agora
      - <iframe allow="camera; microphone; fullscreen; display-capture; autoplay" src="https://meet.jit.si/SuccessiveUniversesTestifyYet" style="height: 100%; width: 100%; border: 0px;"></iframe>
+<<<<<<< HEAD
 - [[push]] [[2021-01-12]]
-  - a friend's 40th birthday!
+  - a friend's 40th birthday!
+=======
+>>>>>>> 682d2fd1b8fdd900968bb40edc223411482f6519
+>>>>>>> 074e7fbc34e5af02117738619b69da1369ba3390

journal/2022-01-08.md

@@ -0,0 +1,8 @@
+# 2022-01-08
+
+- the weekend is here!
+  - [[2022-W01]]
+  - that's the [[iso week date]]
+- [[flancia meet]]
+- [[knowledge commons]]
+- [[family]]