From 3a42b367501ad77cc040c524ad70f3a633ba974f Mon Sep 17 00:00:00 2001
From: gyz <yizeguo1@126.com>
Date: Fri, 10 Jan 2025 14:15:37 +0800
Subject: [PATCH] vault backup: 2025-01-10 14:15:37

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

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 05e8332..b671ef2 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -4,39 +4,20 @@
     "type": "split",
     "children": [
       {
-        "id": "0974d266fd98ccc6",
+        "id": "d936369538901ac3",
         "type": "tabs",
         "children": [
           {
-            "id": "ac38bc1a293c35ce",
+            "id": "378d9732602280d8",
             "type": "leaf",
             "state": {
-              "type": "split-diff-view",
-              "state": {
-                "aFile": ".obsidian/plugins/obsidian-git/obsidian_askpass.sh",
-                "bFile": ".obsidian/plugins/obsidian-git/obsidian_askpass.sh",
-                "aRef": ""
-              },
-              "icon": "diff",
-              "title": "Diff: obsidian_askpass.sh"
-            }
-          },
-          {
-            "id": "9e64b92c11a37bbf",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "力学书籍/材料力学2（第6版） (刘鸿文) (Z-Library)/auto/材料力学2（第6版） (刘鸿文) (Z-Library).md",
-                "mode": "source",
-                "source": false
-              },
+              "type": "empty",
+              "state": {},
               "icon": "lucide-file",
-              "title": "材料力学2（第6版） (刘鸿文) (Z-Library)"
+              "title": "New tab"
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -58,7 +39,7 @@
                 "sortOrder": "alphabetical"
               },
               "icon": "lucide-folder-closed",
-              "title": "文件列表"
+              "title": "Files"
             }
           },
           {
@@ -92,7 +73,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 200
+    "width": 332.5
   },
   "right": {
     "id": "de2dec4e906755e6",
@@ -173,22 +154,23 @@
       }
     ],
     "direction": "horizontal",
-    "width": 575.5
+    "width": 508.5
   },
   "left-ribbon": {
     "hiddenItems": {
-      "switcher:打开快速切换": false,
-      "graph:查看关系图谱": false,
-      "canvas:新建白板": false,
-      "daily-notes:打开/创建今天的日记": false,
-      "templates:插入模板": false,
-      "command-palette:打开命令面板": false,
+      "switcher:Open quick switcher": false,
+      "graph:Open graph view": false,
+      "canvas:Create new canvas": false,
+      "daily-notes:Open today's daily note": false,
+      "templates:Insert template": false,
+      "command-palette:Open command palette": false,
       "copilot:Open Copilot Chat": false,
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "9e64b92c11a37bbf",
+  "active": "8080c9209794d082",
   "lastOpenFiles": [
+    "力学书籍/材料力学2（第6版） (刘鸿文) (Z-Library)/auto/材料力学2（第6版） (刘鸿文) (Z-Library).md",
     "力学书籍/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library)/auto/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library).pdf",
     "力学书籍/理论力学（II） (哈尔滨工业大学理论力学教研室 编) (Z-Library)/auto/理论力学（II） (哈尔滨工业大学理论力学教研室 编) (Z-Library).pdf",
     "力学书籍/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library)/auto/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library).pdf",
@@ -209,13 +191,11 @@
     "力学书籍/材料力学I（第6版） (刘鸿文) (Z-Library)/auto/images/fc8c17fac2ccc6627fd5cbf8b4b3c9ea64ed23b50ddc96288000450c34d6b26e.jpg",
     "力学书籍/材料力学I（第6版） (刘鸿文) (Z-Library)/auto/images/fc9bf58bfa5e022136eb97d44aabab8c43ad1d4a640edb86ace15cd56a5cb00f.jpg",
     "力学书籍/材料力学I（第6版） (刘鸿文) (Z-Library)/auto/材料力学I（第6版） (刘鸿文) (Z-Library)_spans.pdf",
-    "力学书籍/材料力学I（第6版） (刘鸿文) (Z-Library)/auto/材料力学I（第6版） (刘鸿文) (Z-Library)_origin.pdf",
     "力学书籍/材料力学I（第6版） (刘鸿文) (Z-Library)/auto/材料力学I（第6版） (刘鸿文) (Z-Library).md",
     "力学书籍/结构动力学 (R. 克拉夫，J. 彭津) (Z-Library)/auto/结构动力学 (R. 克拉夫，J. 彭津) (Z-Library).md",
     "力学书籍/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library)/auto/理论力学Ⅰ(第8版) (哈尔滨工业大学理论力学教研室) (Z-Library).md",
     "力学书籍/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library)/auto/结构力学Ⅰ（基础教程） (龙驭球、包世华、袁驷) (Z-Library).md",
     "力学书籍/理论力学（II） (哈尔滨工业大学理论力学教研室 编) (Z-Library)/auto/理论力学（II） (哈尔滨工业大学理论力学教研室 编) (Z-Library).md",
-    "力学书籍/材料力学2（第6版） (刘鸿文) (Z-Library)/auto/材料力学2（第6版） (刘鸿文) (Z-Library).md",
     "conflict-files-obsidian-git.md",
     "Ai/ollama 设置模型上下文大小.md",
     "Ai/deepSeek Api Key.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