From 8c0426558500c266ad38bea368e5633a0a029055 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sat, 8 May 2021 01:53:28 +0200
Subject: [PATCH] [[snapshot]]: 2021-05-08 01:53:28

Affected files:

.obsidian/plugins/obsidian-git/data.json
.obsidian/workspace
conflict-files-obsidian-git.md
---
 .obsidian/plugins/obsidian-git/data.json |  2 +-
 .obsidian/workspace                      | 19 ++++---------------
 conflict-files-obsidian-git.md           |  3 +++
 3 files changed, 8 insertions(+), 16 deletions(-)
 create mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 80e1e96ca..913235b0a 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -1 +1 @@
-{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:52:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:52:27 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file
+{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 01:53:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:52:27 GMT+0200 (Central European Summer Time)"}
\ No newline at end of file
diff --git a/.obsidian/workspace b/.obsidian/workspace
index 2f67ae561..19583ac7e 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -76,17 +76,6 @@
                 "mode": "source"
               }
             }
-          },
-          {
-            "id": "35ece4c91a6d7710",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
-                "mode": "source"
-              }
-            }
           }
         ],
         "direction": "horizontal"
@@ -153,7 +142,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
+                "file": "flancia collective.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -170,7 +159,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "conflict-files-obsidian-git.md"
+                "file": "flancia collective.md"
               }
             }
           }
@@ -181,10 +170,10 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "35ece4c91a6d7710",
+  "active": "895ae0e3312eece0",
   "lastOpenFiles": [
-    "conflict-files-obsidian-git.md",
     "flancia collective.md",
+    "conflict-files-obsidian-git.md",
     "agora.md",
     "schelling point.md",
     "agora search.md",
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 000000000..d3a6c7a94
--- /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/plugins/obsidian-git/data.json
\ No newline at end of file