[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
simonsobs · Oct 25, 2023 · 06907b9 · 06907b9
1 parent 0284e7b
commit 06907b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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():