update

2 years ago · 5d37a6c246
1 changed files with 0 additions and 4 deletions
--- a/components/sub_modbus_module/sub_modbus_board_initer.cpp
+++ b/components/sub_modbus_module/sub_modbus_board_initer.cpp
@ -63,8 +63,4 @@ void SubModbusBoardIniter::loop() {
    ModulebusClient::Inst()->loop();
  }
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 187b88da24aed4d0c06bb06e3158b01c2612b57d
 #endif