diff --git a/.obsidian-git-data b/.obsidian-git-data index 5f7237ea5..02d7f979d 100644 --- a/.obsidian-git-data +++ b/.obsidian-git-data @@ -1,4 +1,4 @@ -<<<<<<< HEAD +Thu Jul 08 2021 18:52:41 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) diff --git a/.obsidian/workspace b/.obsidian/workspace index 9c9f502dd..691c273d0 100644 --- a/.obsidian/workspace +++ b/.obsidian/workspace @@ -146,17 +146,6 @@ } } }, - { - "id": "f7863d4f76c0fa37", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", - "mode": "source" - } - } - }, { "id": "e91d03c32f5dc547", "type": "leaf", @@ -343,10 +332,10 @@ "width": 300, "collapsed": true }, - "active": "f7863d4f76c0fa37", + "active": "2cdbadfda15a093e", "lastOpenFiles": [ - "conflict-files-obsidian-git.md", "bmock.md", + "conflict-files-obsidian-git.md", "2021-07-08.md", "2021-07-06.md", "2021-07-07.md", diff --git a/2021-07-08.md b/2021-07-08.md new file mode 100644 index 000000000..b6d86e88a --- /dev/null +++ b/2021-07-08.md @@ -0,0 +1 @@ +- [[bmock]] \ No newline at end of file diff --git a/bmock.md b/bmock.md index be1e001fd..43825d51a 100644 --- a/bmock.md +++ b/bmock.md @@ -1 +1 @@ -- [[pull]] [[b]] +- [[pull]] [[brian mock]]