merge

.obsidian-git-data

@@ -1,5 +1,5 @@
-Fri Jul 09 2021 00:40:56 GMT+0200 (Central European Summer Time)
-Fri Jul 09 2021 00:39:57 GMT+0200 (Central European Summer Time)
+Sat Jul 10 2021 00:23:17 GMT+0200 (Central European Summer Time)
+Sat Jul 10 2021 00:23:17 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)
 =======

.obsidian/workspace

@@ -141,7 +141,18 @@
         "state": {
           "type": "markdown",
           "state": {
-            "file": "brian mock.md",
+            "file": "2021-07-10.md",
+            "mode": "source"
+          }
+        }
+      },
+      {
+        "id": "9b68ae9b83a078cc",
+        "type": "leaf",
+        "state": {
+          "type": "markdown",
+          "state": {
+            "file": "flancian.md",
             "mode": "source"
           }
         }
@@ -332,8 +343,10 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "c74f05c0266decce",
+  "active": "9b68ae9b83a078cc",
   "lastOpenFiles": [
+    "flancian.md",
+    "2021-07-10.md",
     "brian mock.md",
     "opening design.md",
     "bmock.md",
@@ -341,8 +354,6 @@
     "2021-07-06.md",
     "2021-07-07.md",
     "agora bot.md",
-    "would you agree.md",
-    "conflict-files-obsidian-git.md",
-    "2021-07-04.md"
+    "would you agree.md"
   ]
 }

flancian.md

@@ -11,8 +11,9 @@
 	  - [[social.coop]] https://social.coop/@flancian
 	  - [[merveilles]] https://merveilles.town/@flaneur
 	- [[garden]] https://github.com/flancian/garden
-	- [[git]]
 	- [[github]] https://github.com/flancian
+		- [[git]] [[github]]
+	- [[gitlab]] https://gitlab.com/flancian
 	- [[matrix]] @flancian:matrix.org
 	- [[telegram]] @Flancian
 	- [[ctzn]] https://ctznry.com/flancian@ctzn.one