From 4f371a405efcf1484c050016fced0f5ea65a1801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E5=93=B2=E8=88=AA?= Date: Fri, 2 Jan 2026 18:49:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 8b99edd..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 - -- [[0103高数模拟试卷]] - -# 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