From 92b70f3c1917c819acc04e32aab42ed13741937e Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Mon, 9 Mar 2026 06:24:17 +0800
Subject: [PATCH 1/3] vault backup: 2026-03-09 06:24:17

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

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index b14f920..b5695b8 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -179,14 +179,14 @@
   },
   "active": "61794e0c5a3743ba",
   "lastOpenFiles": [
-    "rm常用库/Pasted image 20260205113522.png",
+    "rm常用库/c板常用接口.md",
     "个人日记/2026-03-08.md",
+    "rm常用库/Pasted image 20260205113522.png",
     "rm常用库/Pasted image 20260205113541.png",
     "rm常用库/Pasted image 20260205113634.png",
     "rm常用库/Pasted image 20260205113442.png",
     "rm常用库/Pasted image 20260205113421.png",
     "rm常用库/Pasted image 20260204203012.png",
-    "rm常用库/c板常用接口.md",
     "fusion实验记录/实验对比.md",
     "conflict-files-obsidian-git.md",
     "rm常用库",

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 2/3] 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

From e8ab5d07c8ed40ffbc4c02fb2025a15cf07aa634 Mon Sep 17 00:00:00 2001
From: cyy_compute <cyy@cyy.com>
Date: Mon, 9 Mar 2026 06:28:08 +0800
Subject: [PATCH 3/3] vault backup: 2026-03-09 06:28:08

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

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 7838a52..3440fb1 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -177,8 +177,10 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "8e9bf87d81cab358",
+  "active": "61794e0c5a3743ba",
   "lastOpenFiles": [
+    "个人日记/2026-03-09.md",
+    "个人日记/2026.3.8.md",
     "个人日记/2026-03-08.md",
     "conflict-files-obsidian-git.md",
     "超级备忘/课内备忘/课表.md",
@@ -194,7 +196,6 @@
     "技能树/moonlight-sunshine串流",
     "技能树/frp内网穿透技术",
     "技能树",
-    "个人日记/2026-03-09.md",
     "rm常用库/c板常用接口.md",
     "rm常用库/Pasted image 20260205113522.png",
     "rm常用库/Pasted image 20260205113541.png",
@@ -204,7 +205,6 @@
     "rm常用库/Pasted image 20260204203012.png",
     "fusion实验记录/实验对比.md",
     "rm常用库",
-    "个人日记/2026.3.8.md",
     "零碎的知识/ros1禁用gazebo的gpu功能.md",
     "个人日记",
     "零碎的知识/ppo算法.md",