From 4ed41e254d914d7f53a7574f389ee0fd374daf17 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sat, 8 May 2021 02:10:38 +0200 Subject: [PATCH] [[snapshot]]: 2021-05-08 02:10:38 Affected files: .obsidian/workspace 2021-05-08.md --- .obsidian/workspace | 75 ++++++++++++++++++++------------------------- 2021-05-08.md | 3 +- 2 files changed, 36 insertions(+), 42 deletions(-) diff --git a/.obsidian/workspace b/.obsidian/workspace index 9ce5cb993..41785ecfa 100644 --- a/.obsidian/workspace +++ b/.obsidian/workspace @@ -8,45 +8,46 @@ "type": "split", "children": [ { - "id": "a62adb19ecf08dda", - "type": "split", - "children": [ - { - "id": "2639e028cd5027a6", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "2021-05-08.md", - "mode": "source" - } - } - }, - { - "id": "faefe5a3d24691d8", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "vault.md", - "mode": "source" - } - } + "id": "2639e028cd5027a6", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "2021-05-08.md", + "mode": "source" } - ], - "direction": "vertical" + } }, { - "id": "b61980722fe54953", + "id": "faefe5a3d24691d8", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "vault.md", + "mode": "source" + } + } + }, + { + "id": "b30348f6c7f39a22", + "type": "leaf", + "state": { + "type": "graph", + "state": {} + } + }, + { + "id": "d8cea4f32927b488", "type": "split", "children": [ { - "id": "895ae0e3312eece0", + "id": "8f6efcf79b333fb4", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "flancia collective.md", + "file": "obsidian.md", "mode": "source" } } @@ -64,7 +65,6 @@ } ], "direction": "vertical" -<<<<<<< HEAD }, { "id": "895ae0e3312eece0", @@ -87,8 +87,6 @@ "mode": "source" } } -======= ->>>>>>> 9defd5e6ae8ec663f4fa7867947fa99a6d625aa6 } ], "direction": "horizontal" @@ -135,8 +133,7 @@ "state": {} } } - ], - "currentTab": 1 + ] } ], "direction": "horizontal", @@ -184,21 +181,17 @@ "width": 300, "collapsed": true }, -<<<<<<< HEAD - "active": "d3c1ae0a5fe4433c", -======= "active": "2639e028cd5027a6", ->>>>>>> 9defd5e6ae8ec663f4fa7867947fa99a6d625aa6 "lastOpenFiles": [ "2021-05-08.md", "2021-05-07.md", - "flancia collective.md", - "fediverse.md", "conflict-files-obsidian-git.md", + "flancia collective.md", "agora.md", "schelling point.md", "agora search.md", "schelling points.md", - "vault.md" + "vault.md", + "agora editor.md" ] } \ No newline at end of file diff --git a/2021-05-08.md b/2021-05-08.md index a6f4385d9..76781b483 100644 --- a/2021-05-08.md +++ b/2021-05-08.md @@ -1,4 +1,5 @@ - part of [[weekend 18]] - [[do]] - [[plan]] [[week 19]] - - go to [[supermarket]] \ No newline at end of file + - go to [[supermarket]] +- trying multi client editing in obsidian plus [[obsidian git]], wish me luck! \ No newline at end of file