vault backup: 2026-04-05 00:36:24

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "DEADLINE"
             }
+          },
+          {
+            "id": "ec961973db924bbc",
+            "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"
@@ -177,16 +192,16 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "91e8abff8204bf3b",
+  "active": "ec961973db924bbc",
   "lastOpenFiles": [
+    "个人总纲和进度监督/DEADLINE.md",
+    "conflict-files-obsidian-git.md",
     "超级备忘/传感器与自动测量/传感器与自动测量.md",
     "技能树/frp内网穿透技术/frp内网穿透.md",
     "技能树/moonlight-sunshine串流/moonlight-sunshine.md",
     "超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg",
     "超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg",
     "超级备忘/课内备忘/Pasted image 20260313115708.png",
-    "个人总纲和进度监督/DEADLINE.md",
-    "conflict-files-obsidian-git.md",
     "超级备忘/激光原理/激光原理.md",
     "超级备忘/激光原理",
     "超级备忘/机器学习/机器视觉.md",

个人总纲和进度监督/DEADLINE.md

@@ -11,9 +11,7 @@
 
 | 任务         |     |
 | ---------- | --- |
-| 光纤通信作业     |     |
 | 光电实验报告     |     |
-| 激光原理作业     |     |
 | 机器视觉的书     |     |
 | 数据图像处理实验报告 |     |
 | 传感器报告      |     |
@@ -24,6 +22,7 @@
 | ---- | --- |
 | 制导飞镖 |     |
 
+
 ## 论文
 
 | 任务              | deadline |

超级备忘/激光原理/激光原理.md

@@ -0,0 +1 @@
+第十周考试，开卷