vault backup: 2026-05-10 10:15:30

2026-05-10 10:15:30 +08:00
parent 060c0ea760
commit 5d856e6a75
2 changed files with 3 additions and 6 deletions
--- a/.obsidian/community-plugins.json
+++ b/.obsidian/community-plugins.json
@@ -2,10 +2,7 @@
  "obsidian-git",
  "obsidian-tasks-plugin",
  "pdf-plus",
-<<<<<<< HEAD
+  "tasks-calendar-wrapper",
  "advanced-canvas",
-  "obsidian-plantuml",
-=======
->>>>>>> origin/main
-  "tasks-calendar-wrapper"
+  "obsidian-plantuml"
 ]
--- a/部门五月份任务规划.md
+++ b/部门五月份任务规划.md
@@ -65,7 +65,7 @@

 #### 交付物

- [x] 原型机硬件问题清单 ✅ 2026-05-09
+- [x] 原型机硬件问题清单 ✅ 2026-05-10
 - [ ] 新版原理图修改需求清单
 - [ ] 新版原理图 V1
 - [ ] 原型机硬件问题修复对照表