From 26a32afd0db3ea46754f5e398036463d8637f0fb Mon Sep 17 00:00:00 2001
From: asskicker0214 <asskicker0214@outlook.com>
Date: Sat, 26 Apr 2025 13:22:00 +0800
Subject: [PATCH] vault backup: 2025-04-26 13:22:00

---
 conflict-files-obsidian-git.md | 17 -----------------
 1 file changed, 17 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 2153955..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
-
-- [[迭代一]]
-
-# 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