From e70c545ec80e5b9eadde7471ea383156d9c73ef0 Mon Sep 17 00:00:00 2001
From: calvincao <calvincao@qifalab.com>
Date: Tue, 21 Oct 2025 15:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20**bioyond=5Fyihua=5FYB.jso?=
 =?UTF-8?q?n**=20=E4=B8=AD=E7=9A=84=20JSON=20=E5=90=88=E5=B9=B6=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=EF=BC=8C=E6=B8=85=E7=90=86=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E8=AE=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bioyond_studio/bioyond_cell/bioyond_yihua_YB.json         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
index 81e1ee78..3d1b98af 100644
--- a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
+++ b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
@@ -11,10 +11,6 @@
       "config": {
           "protocol_type": [],
           "station_resource": {}
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 
       },
       "data": {}