From 06907b902748c7dbe5bcf64a520efac4d0b3f72d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:54:14 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 socs/agents/hi6200/agent.py   | 7 ++++---
 socs/agents/hi6200/drivers.py | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/socs/agents/hi6200/agent.py b/socs/agents/hi6200/agent.py
index 81ffa1ab8..eaafe217b 100644
--- a/socs/agents/hi6200/agent.py
+++ b/socs/agents/hi6200/agent.py
@@ -40,17 +40,18 @@ def init(self, session, params=None):
             if not acquired:
                 return False, "Could not acquire lock"
 
-<<<<<<< HEAD
+
+<< << << < HEAD
             self.scale = Hi6200Interface(self.ip_address, self.tcp_port)
 
-=======
+== == == =
             try:
                 self.scale = Hi6200Interface(self.ip_address, self.tcp_port)
 
             except BaseException:
                 self.log.error(f"Some unknown error occurred initializing TCP Server")
                 return False, "TCP Failure"
->>>>>>> refs/remotes/origin/add_Hi6200_Agent
+>>>>>> > refs / remotes / origin / add_Hi6200_Agent
             self.log.info("Connected to scale.")
 
         return True, 'Initialized Scale.'
diff --git a/socs/agents/hi6200/drivers.py b/socs/agents/hi6200/drivers.py
index 4d9b6117b..c706ee2bb 100644
--- a/socs/agents/hi6200/drivers.py
+++ b/socs/agents/hi6200/drivers.py
@@ -1,10 +1,11 @@
 import struct
 
-<<<<<<< HEAD
-=======
+<< << << < HEAD
+== == == =
 from pyModbusTCP.client import ModbusClient
 
->>>>>>> refs/remotes/origin/add_Hi6200_Agent
+>>>>>> > refs / remotes / origin / add_Hi6200_Agent
+
 
 class Hi6200Interface():