From 57969b31de816a8ecf17b28dedd7cb2088b1b8b4 Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Wed, 1 Apr 2026 21:18:20 +0800
Subject: [PATCH] vault backup: 2026-04-01 21:18:20

---
 .obsidian/workspace.json       | 19 ++-----------------
 conflict-files-obsidian-git.md | 17 -----------------
 2 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 09c358c..89e4002 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,23 +20,8 @@
               "icon": "lucide-file",
               "title": "DEADLINE"
             }
-          },
-          {
-            "id": "9b6c18a21b5ab104",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "conflict-files-obsidian-git"
-            }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -192,7 +177,7 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "9b6c18a21b5ab104",
+  "active": "8e9bf87d81cab358",
   "lastOpenFiles": [
     "个人总纲和进度监督/DEADLINE.md",
     "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