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

.gitignore

@@ -1,4 +1,4 @@
 .*swp
 private/
-
 .obsidian/workspace
+.obsidian/plugins/obsidian-git/data.json

.obsidian/plugins/obsidian-git/data.json

@@ -1 +1 @@
-{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:52:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:51:46 GMT+0200 (Central European Summer Time)"}
+{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:01:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:01:46 GMT+0200 (Central European Summer Time)"}

.obsidian/workspace

@@ -76,6 +76,17 @@
                 "mode": "source"
               }
             }
+          },
+          {
+            "id": "d3c1ae0a5fe4433c",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source"
+              }
+            }
           }
         ],
         "direction": "horizontal"
@@ -142,7 +153,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "flancia collective.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -159,7 +170,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "flancia collective.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           }
@@ -170,8 +181,9 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "895ae0e3312eece0",
+  "active": "d3c1ae0a5fe4433c",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "flancia collective.md",
     "agora.md",
     "schelling point.md",
@@ -180,7 +192,6 @@
     "schelling points.md",
     "vault.md",
     "agora editor.md",
-    "meet.md",
+    "meet.md"
-    "obsidian git.md"
   ]
 }