From 603889484edc4be7c5fdc9b014d80ae9706737cb Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Wed, 21 Apr 2021 15:45:08 +0200
Subject: [PATCH] conflict fix and logging error workaround
---
devices/clients/opcua_connection.py | 4 ----
devices/src/hardware_device.py | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/devices/clients/opcua_connection.py b/devices/clients/opcua_connection.py
index ea98b340d..85962f421 100644
--- a/devices/clients/opcua_connection.py
+++ b/devices/clients/opcua_connection.py
@@ -1,10 +1,6 @@
from threading import Thread
import socket
-<<<<<<< HEAD
from src.comms_client import CommClient
-=======
-from src.comms_client import *
->>>>>>> master
import numpy
import opcua
from opcua import Client
diff --git a/devices/src/hardware_device.py b/devices/src/hardware_device.py
index bd570d3ff..2a2dafb57 100644
--- a/devices/src/hardware_device.py
+++ b/devices/src/hardware_device.py
@@ -23,7 +23,7 @@ __all__ = ["hardware_device"]
from src.wrappers import only_in_states
-@log_exceptions()
+#@log_exceptions()
class hardware_device(Device):
"""
--
GitLab