From 2c16ef2a7ed9907d1e564f21c1b7248e0cd979a7 Mon Sep 17 00:00:00 2001
From: cdeyw <827523911@qq.com>
Date: Tue, 30 Sep 2025 16:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 4c7f4c9..89c2fb7 100644
--- a/README.md
+++ b/README.md
@@ -146,12 +146,9 @@
 
 项目包含针对各个模块的单元测试，位于 `tests/` 目录下：
 - `hardware_test.py` - 硬件控制器测试,用debug的方式逐行运行，测试各个硬件功能
-<<<<<<< HEAD
 - `test_relay_controller.py` - 继电器控制器测试
 - `test_inverter_controller.py` - 变频器控制器测试
 - `test_transmitter_controller.py` - 变送器控制器测试
-=======
->>>>>>> 2a76e058732eec1af672630d7a530bb64fc2c33a
 
 参数修改：
 继电器信息修改hardware/relay.py