mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-18 05:21:19 +00:00
修复 **bioyond_yihua_YB.json** 中的 JSON 合并冲突,清理不必要的标记。
This commit is contained in:
@@ -11,10 +11,6 @@
|
|||||||
"config": {
|
"config": {
|
||||||
"protocol_type": [],
|
"protocol_type": [],
|
||||||
"station_resource": {}
|
"station_resource": {}
|
||||||
<<<<<<< Updated upstream
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
},
|
},
|
||||||
"data": {}
|
"data": {}
|
||||||
|
|||||||
Reference in New Issue
Block a user