From 7b4fabdc25d1de53870c0aa7e65fa20c1be20041 Mon Sep 17 00:00:00 2001
From: Stefan Allius <stefan.allius@t-online.de>
Date: Tue, 3 Sep 2024 18:48:21 +0200
Subject: [PATCH] fix merge conflikt

---
 app/tests/test_modbus_tcp.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/tests/test_modbus_tcp.py b/app/tests/test_modbus_tcp.py
index 9c20e80..5ce73af 100644
--- a/app/tests/test_modbus_tcp.py
+++ b/app/tests/test_modbus_tcp.py
@@ -253,7 +253,6 @@ async def test_modbus_cnf2(config_conn, patch_no_mqtt, patch_open):
         if (m.node_id == 'inv_2'):
             assert False
 
-
 @pytest.mark.asyncio
 async def test_modbus_cnf3(config_conn, patch_no_mqtt, patch_open):
     _ = config_conn