From b0fe5241728068172b4d79050fafc222e3818576 Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Fri, 8 May 2026 19:18:23 +0800
Subject: [PATCH] vault backup: 2026-05-08 19:18:23

---
 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 d8bbd4f..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
-
-- 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