From f2728e0d596455c69847c14a1b48d16b3ec64f12 Mon Sep 17 00:00:00 2001
From: cyy_mac <cyy_mac@mac>
Date: Wed, 8 Apr 2026 09:32:05 +0800
Subject: [PATCH 1/2] vault backup: 2026-04-08 09:32:05

---
 .obsidian/workspace.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index d7b5b82..6d3ce45 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -13,12 +13,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "零碎的知识/clould code.md",
+                "file": "个人总纲和进度监督/DEADLINE.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "clould code"
+              "title": "DEADLINE"
             }
           }
         ]
@@ -180,15 +180,16 @@
   },
   "active": "ee6712e4bb96f904",
   "lastOpenFiles": [
+    "超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg",
+    "超级备忘/课内备忘/课表.md",
     "超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg",
-    "个人总纲和进度监督/DEADLINE.md",
+    "超级备忘/课内备忘/Pasted image 20260313115708.png",
     "超级备忘/机器学习/机器视觉.md",
+    "超级备忘/图像处理/数字图像处理.md",
+    "零碎的知识/clould code.md",
+    "个人总纲和进度监督/DEADLINE.md",
     "超级备忘/光纤通信/光纤通信.md",
     "超级备忘/激光原理/激光原理.md",
-    "超级备忘/图像处理/数字图像处理.md",
-    "超级备忘/课内备忘/Pasted image 20260313115708.png",
-    "超级备忘/课内备忘/课表.md",
-    "超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg",
     "conflict-files-obsidian-git.md",
     "超级备忘/激光原理",
     "超级备忘/机器学习/实验课.md",
@@ -221,7 +222,6 @@
     "rm常用库/Pasted image 20260205113421.png",
     "rm常用库/Pasted image 20260204203012.png",
     "rm常用库/Pasted image 20260205113522.png",
-    "零碎的知识/ros1禁用gazebo的gpu功能.md",
     "rm常用库/Pasted image 20260205113541.png",
     "rm常用库/Pasted image 20260205113442.png",
     "rm常用库/Pasted image 20260205113634.png"

From b498c7429f42b464a683132313650440379860b1 Mon Sep 17 00:00:00 2001
From: cyy_mac <cyy_mac@mac>
Date: Wed, 8 Apr 2026 09:32:39 +0800
Subject: [PATCH 2/2] vault backup: 2026-04-08 09:32:39

---
 .obsidian/workspace.json       | 17 +----------------
 conflict-files-obsidian-git.md | 17 -----------------
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 4b0a5b8..02db161 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -20,23 +20,8 @@
               "icon": "lucide-file",
               "title": "DEADLINE"
             }
-          },
-          {
-            "id": "c8f11c2dadc04da1",
-            "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"
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