From 57f9a9e0a9d1ba5a699d384a69ea9e0db544d723 Mon Sep 17 00:00:00 2001 From: Peaceultime Date: Tue, 2 Jul 2024 20:30:48 +0200 Subject: [PATCH] vault sync 2024-07-02 20:30:48 --- conflict-files-obsidian-git.md | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 conflict-files-obsidian-git.md diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md deleted file mode 100644 index 96c991c..0000000 --- a/conflict-files-obsidian-git.md +++ /dev/null @@ -1,18 +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 - -- [[Progression.canvas]] -- [[Les évolutions de valeur.canvas]] - -# 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