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

.obsidian/workspace

@@ -62,6 +62,17 @@
               }
             }
           },
+          {
+            "id": "a4dda1d0bb7856cf",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "will walker.md",
+                "mode": "source"
+              }
+            }
+          },
           {
             "id": "99a9f3fa87985827",
             "type": "leaf",
@@ -73,6 +84,17 @@
               }
             }
           },
+          {
+            "id": "847a218a56078dc5",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source"
+              }
+            }
+          },
           {
             "id": "790a00bed2dcbc67",
             "type": "leaf",
@@ -204,7 +226,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "knight first amendment institute.md",
+                "file": "will walker.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -221,7 +243,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "knight first amendment institute.md"
+                "file": "will walker.md"
               }
             }
           }
@@ -232,17 +254,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "99a9f3fa87985827",
+  "active": "a4dda1d0bb7856cf",
   "lastOpenFiles": [
+    "will walker.md",
+    "reimagine the internet.md",
+    "conflict-files-obsidian-git.md",
     "knight first amendment institute.md",
     "2021-05-12.md",
-    "reimagine the internet.md",
     "chris aldrich.md",
     "file handler.md",
     "beautiful.md",
     "stoa.md",
-    "metabolist.md",
+    "metabolist.md"
-    "wabi sabi.md",
-    "reading alexander.md"
   ]
 }

conflict-files-obsidian-git.md

@@ -1,3 +1,3 @@
 # Conflict files
 Please resolve them and commit per command (This file will be deleted before the commit).
-- Not a file: .obsidian/plugins/obsidian-git/data.json
+- Not a file: .obsidian/workspace

reimagine the internet.md

@@ -2,4 +2,6 @@
 - [[go]] https://knightcolumbia.org/events/reimagine-the-internet
 	- by [[knight first amendment institute]] at [[columbia university]]
 	- [[event]] https://www.eventbrite.com/x/reimagine-the-internet-tickets-150266819101
-- https://twitter.com/knightcolumbia/status/1382023092273352710
+	- [[will walker]] told me about it.
+
+https://twitter.com/knightcolumbia/status/1382023092273352710

will walker.md

@@ -1,7 +1,9 @@
 # Will Walker
 
 - A [[person]].
-  - [[law]]
+	- studying [[law]]
-- In [[social.coop]].
+	- [[friend]]
+	- [[twitter]] https://twitter.com/willwalker33
+	- in [[social.coop]].