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/
+*.swp

.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 02:01:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:01: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:02:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:02:46 GMT+0200 (Central European Summer Time)"}

.obsidian/starred.json

@@ -0,0 +1 @@
+{"items":[{"type":"file","title":"flancia collective","path":"flancia collective.md"}]}

.obsidian/workspace

@@ -6,6 +6,10 @@
       {
         "id": "b0a62e0bd6f30307",
         "type": "split",
+        "children": [
+          {
+            "id": "a62adb19ecf08dda",
+            "type": "split",
             "children": [
               {
                 "id": "2639e028cd5027a6",
@@ -13,7 +17,7 @@
                 "state": {
                   "type": "markdown",
                   "state": {
-                "file": "2021-05-07.md",
+                    "file": "2021-05-08.md",
                     "mode": "source"
                   }
                 }
@@ -28,26 +32,21 @@
                     "mode": "source"
                   }
                 }
-          },
-          {
-            "id": "b30348f6c7f39a22",
-            "type": "leaf",
-            "state": {
-              "type": "graph",
-              "state": {}
               }
+            ],
+            "direction": "vertical"
           },
           {
-            "id": "d8cea4f32927b488",
+            "id": "b61980722fe54953",
             "type": "split",
             "children": [
               {
-                "id": "8f6efcf79b333fb4",
+                "id": "895ae0e3312eece0",
                 "type": "leaf",
                 "state": {
                   "type": "markdown",
                   "state": {
-                    "file": "obsidian.md",
+                    "file": "flancia collective.md",
                     "mode": "source"
                   }
                 }
@@ -65,6 +64,7 @@
               }
             ],
             "direction": "vertical"
+<<<<<<< HEAD
           },
           {
             "id": "895ae0e3312eece0",
@@ -87,6 +87,8 @@
                 "mode": "source"
               }
             }
+=======
+>>>>>>> 9defd5e6ae8ec663f4fa7867947fa99a6d625aa6
           }
         ],
         "direction": "horizontal"
@@ -133,7 +135,8 @@
               "state": {}
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "horizontal",
@@ -153,7 +156,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
+                "file": "2021-05-08.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -170,7 +173,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "conflict-files-obsidian-git.md"
+                "file": "2021-05-08.md"
               }
             }
           }
@@ -181,17 +184,21 @@
     "width": 300,
     "collapsed": true
   },
+<<<<<<< HEAD
   "active": "d3c1ae0a5fe4433c",
+=======
+  "active": "2639e028cd5027a6",
+>>>>>>> 9defd5e6ae8ec663f4fa7867947fa99a6d625aa6
   "lastOpenFiles": [
-    "conflict-files-obsidian-git.md",
+    "2021-05-08.md",
+    "2021-05-07.md",
     "flancia collective.md",
+    "fediverse.md",
+    "conflict-files-obsidian-git.md",
     "agora.md",
     "schelling point.md",
     "agora search.md",
-    "2021-05-07.md",
     "schelling points.md",
-    "vault.md",
+    "vault.md"
-    "agora editor.md",
-    "meet.md"
   ]
 }

2021-05-08.md

@@ -0,0 +1,4 @@
+- part of [[weekend 18]]
+- [[do]]
+	- [[plan]] [[week 19]]
+	- go to [[supermarket]]