From 7015f4d722658f4c447fe14fd4353e956b1d32da Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Mon, 9 Mar 2026 06:25:05 +0800
Subject: [PATCH] vault backup: 2026-03-09 06:25:05

---
 .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 d6f9e9b..7838a52 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,23 +20,8 @@
               "icon": "lucide-file",
               "title": "2026-03-08"
             }
-          },
-          {
-            "id": "7de3237f369d0dc1",
-            "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": "7de3237f369d0dc1",
+  "active": "8e9bf87d81cab358",
   "lastOpenFiles": [
     "个人日记/2026-03-08.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