From 3e6657d0732074e77b6facf815c2d30f9f72d93d Mon Sep 17 00:00:00 2001
From: Peaceultime <clem31470@gmail.com>
Date: Fri, 14 Jul 2023 14:59:49 +0200
Subject: [PATCH] vault sync 2023-07-14 14:59:49

---
 .obsidian/workspace.json       | 23 +++--------------------
 conflict-files-obsidian-git.md | 17 -----------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index a541c66..48c8e3b 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -21,21 +21,8 @@
                 }
               }
             }
-          },
-          {
-            "id": "9d6d3e5b87d40dc2",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
-                "mode": "source",
-                "source": false
-              }
-            }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -101,7 +88,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -118,7 +104,6 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -140,9 +125,7 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {
-                "file": "conflict-files-obsidian-git.md"
-              }
+              "state": {}
             }
           },
           {
@@ -170,7 +153,7 @@
       "command-palette:Open command palette": false
     }
   },
-  "active": "9d6d3e5b87d40dc2",
+  "active": "faeee25a525bf503",
   "lastOpenFiles": [
     "Règles/2. L'entrainement/Progression.canvas",
     "conflict-files-obsidian-git.md"
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index d8f43a8..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Conflicts
-Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
-(This file will automatically be deleted before commit)
-[[#Additional Instructions]] available below file list
-
-- Not a file: .obsidian/workspace.json
-
-# Additional Instructions
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-```diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-```
\ No newline at end of file