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

.obsidian-git-data

@@ -1,2 +1,3 @@
-Sat Jul 03 2021 13:05:07 GMT+0200 (Central European Summer Time)
+Sat Jul 03 2021 13:40:07 GMT+0200 (Central European Summer Time)
+Sat Jul 03 2021 13:40:07 GMT+0200 (Central European Summer Time)
 Sat Jul 03 2021 13:05:07 GMT+0200 (Central European Summer Time)

.obsidian/workspace

@@ -47,6 +47,17 @@
           }
         }
       },
+      {
+        "id": "31fb43b476ed534c",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "conflict-files-obsidian-git.md",
+            "mode": "source"
+          }
+        }
+      },
       {
         "id": "d9ea409464f5016f",
         "type": "leaf",
@@ -130,7 +141,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "argh.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -147,7 +158,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "argh.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -203,17 +214,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "1f94d8e6aef3ebfe",
+  "active": "31fb43b476ed534c",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "argh.md",
+    "2021-07-03.md",
     "2021-07-02.md",
     "chowdy.md",
     "agora server.md",
     "infranaut.md",
     "zeno of elea.md",
     "zeno.md",
-    "zeno's paradoxes.md",
-    "infragora.md",
-    "ontology.md"
+    "zeno's paradoxes.md"
   ]
 }