From 835c77973f674fc50be427085ab2a60a2f8b64fe Mon Sep 17 00:00:00 2001 From: Dane Sabo Date: Thu, 5 Sep 2024 16:27:59 -0400 Subject: [PATCH] vault backup: 2024-09-05 16:27:59 --- 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 34b81467e..000000000 --- a/conflict-files-obsidian-git.md +++ /dev/null @@ -1,18 +0,0 @@ -pace.json Conflicts -Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` -(This file will automatically be deleted before commit) -[[#Additional Instructions]] available below file list - -- Not a file: .obsidian/plugins/obsidian-pandoc-reference-list/data.json -- 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