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

.obsidian-git-data

@@ -1,9 +1,19 @@
-Thu Jul 08 2021 02:04:07 GMT+0200 (Central European Summer Time)
+Thu Jul 08 2021 18:51:41 GMT+0200 (Central European Summer Time)
+Thu Jul 08 2021 18:51:44 GMT+0200 (Central European Summer Time)
 Thu Jul 08 2021 02:04:10 GMT+0200 (Central European Summer Time)
+=======
+Thu Jul 08 2021 02:03:54 GMT+0200 (Central European Summer Time)
+Thu Jul 08 2021 02:02:54 GMT+0200 (Central European Summer Time)
+Wed Jul 07 2021 12:58:41 GMT+0200 (Central European Summer Time)
+=======
+Wed Jul 07 2021 00:33:04 GMT+0200 (Central European Summer Time)
+Wed Jul 07 2021 00:32:07 GMT+0200 (Central European Summer Time)
+>>>>>>> 9008f5c48094e40cd632f6a9ae31197e6e3bfba6
 Tue Jul 06 2021 20:52:05 GMT+0200 (Central European Summer Time)
 =======
 Tue Jul 06 2021 20:52:38 GMT+0200 (Central European Summer Time)
 Tue Jul 06 2021 20:51:38 GMT+0200 (Central European Summer Time)
+>>>>>>> 197eacf36fb5b01000a95f88b0051ca201b89431
 Mon Jul 05 2021 17:42:20 GMT+0200 (Central European Summer Time)
 =======
 Mon Jul 05 2021 01:04:00 GMT+0200 (Central European Summer Time)

.obsidian/workspace

@@ -124,6 +124,39 @@
           }
         }
       },
+      {
+        "id": "339f9c924bf4e2fb",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "2021-07-08.md",
+            "mode": "source"
+          }
+        }
+      },
+      {
+        "id": "2cdbadfda15a093e",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "bmock.md",
+            "mode": "source"
+          }
+        }
+      },
+      {
+        "id": "f7863d4f76c0fa37",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "conflict-files-obsidian-git.md",
+            "mode": "source"
+          }
+        }
+      },
       {
         "id": "e91d03c32f5dc547",
         "type": "leaf",
@@ -310,17 +343,17 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "dc48b62f3dfe1e38",
+  "active": "f7863d4f76c0fa37",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "bmock.md",
+    "2021-07-08.md",
     "2021-07-06.md",
     "2021-07-07.md",
     "2021-07-04.md",
     "would you agree.md",
     "the future of note taking.md",
-    "conflict-files-obsidian-git.md",
     "future of note taking.md",
-    "agora bot.md",
-    "wikipedia.md",
-    "cloud computer.md"
+    "agora bot.md"
   ]
 }

conflict-files-obsidian-git.md

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

watching.md

@@ -1,7 +1,10 @@
 # watching
 
 - [[ikuru]]
+	- great but a bit depressing?
 - [[promising young woman]]
 - [[can't get you out of my head]]
+	- [[done]]
 - [[yoga with adriene]]
+	- [[always]]