From 8d766208bf8927431a19791b546260854b3377d7 Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Wed, 8 Apr 2026 10:19:48 +0800
Subject: [PATCH] vault backup: 2026-04-08 10:19:48

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

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 922713e..c30ce3e 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -15,10 +15,8 @@
               "type": "pdf",
               "state": {
                 "file": "考研/math/27张宇基础30讲高数.pdf",
-                "page": 8,
-                "left": -16,
-                "top": 190,
-                "zoom": 0.9343082636954503
+                "page": 1,
+                "zoom": 1
               },
               "icon": "lucide-file-text",
               "title": "27张宇基础30讲高数"
@@ -44,23 +42,8 @@
               "icon": "lucide-file",
               "title": "001_前言"
             }
-          },
-          {
-            "id": "a556e58566628795",
-            "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"
@@ -219,7 +202,7 @@
       "pdf-plus:PDF++: Toggle auto-paste": false
     }
   },
-  "active": "a556e58566628795",
+  "active": "8e9bf87d81cab358",
   "lastOpenFiles": [
     "考研/math/001_前言.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