From 804b10e10a83ac717244bda8825558eabf425608 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 3 Jul 2021 13:41:07 +0200
Subject: [PATCH] [[snapshot]]: 2021-07-03 13:41:07

Affected files:

.obsidian-git-data
.obsidian/workspace
2021-07-02.md
conflict-files-obsidian-git.md
---
 .obsidian-git-data             |  2 +-
 .obsidian/workspace            | 23 ++++++-----------------
 2021-07-02.md                  |  3 ++-
 conflict-files-obsidian-git.md |  3 +++
 4 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian-git-data b/.obsidian-git-data
index c2729ba5b..f5d30f5d8 100644
--- a/.obsidian-git-data
+++ b/.obsidian-git-data
@@ -1,3 +1,3 @@
-Sat Jul 03 2021 13:40:07 GMT+0200 (Central European Summer Time)
+Sat Jul 03 2021 13:41:07 GMT+0200 (Central European Summer Time)
 Sat Jul 03 2021 13:40:07 GMT+0200 (Central European Summer Time)
 Sat Jul 03 2021 13:05:07 GMT+0200 (Central European Summer Time)
diff --git a/.obsidian/workspace b/.obsidian/workspace
index 9aed5a7ac..5392a501b 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -47,17 +47,6 @@
           }
         }
       },
-      {
-        "id": "31fb43b476ed534c",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "conflict-files-obsidian-git.md",
-            "mode": "source"
-          }
-        }
-      },
       {
         "id": "d9ea409464f5016f",
         "type": "leaf",
@@ -141,7 +130,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
+                "file": "2021-07-02.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -158,7 +147,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "conflict-files-obsidian-git.md"
+                "file": "2021-07-02.md"
               }
             }
           },
@@ -214,12 +203,12 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "31fb43b476ed534c",
+  "active": "32ac6e1822cb86d7",
   "lastOpenFiles": [
-    "conflict-files-obsidian-git.md",
-    "argh.md",
-    "2021-07-03.md",
     "2021-07-02.md",
+    "argh.md",
+    "conflict-files-obsidian-git.md",
+    "2021-07-03.md",
     "chowdy.md",
     "agora server.md",
     "infranaut.md",
diff --git a/2021-07-02.md b/2021-07-02.md
index 8bd81cf2a..55702931e 100644
--- a/2021-07-02.md
+++ b/2021-07-02.md
@@ -6,4 +6,5 @@
 - [[zeno]]
 - [[infranaut]]
 	- [[argh]]
-- [[agora server]]
\ No newline at end of file
+- [[agora server]]
+- [[ocell]]
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 000000000..3d5d61cb1
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +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
\ No newline at end of file