From 343fd6d804d538ebd54e01bad463b45700f7afc4 Mon Sep 17 00:00:00 2001
From: cyy_mac <cyy_mac@mac>
Date: Fri, 10 Apr 2026 05:45:11 +0800
Subject: [PATCH] vault backup: 2026-04-10 05:45:11

---
 .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 dfa04aa..9fca677 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -42,23 +42,8 @@
               "icon": "lucide-file",
               "title": "机器视觉"
             }
-          },
-          {
-            "id": "a40c5e0deff9b339",
-            "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"
@@ -218,7 +203,7 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "a40c5e0deff9b339",
+  "active": "8e9bf87d81cab358",
   "lastOpenFiles": [
     "超级备忘/机器学习/机器视觉.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