Removed checked-in merge conflict

devices/PCC.py

@@ -97,19 +97,10 @@ class PCC(hardware_device):
     HBA_element_pwr_RW = attribute_wrapper(comms_annotation=["2:PCC", "2:HBA_element_pwr_RW"], datatype=numpy.int64, dims=(32, 96),
                                            access=AttrWriteType.READ_WRITE)
 
-<<<<<<< HEAD
-    HBA_element_pwr_RW = attribute_wrapper(comms_annotation=["2:PCC", "2:HBA_element_pwr_RW"], datatype=numpy.int64, dims=(32, 96), access=AttrWriteType.READ_WRITE)
-
-    uC_ID_R = attribute_wrapper(comms_annotation=["2:PCC", "2:uC_ID_R"], datatype=numpy.int64, dims=(32,))
-
-    RCU_monitor_rate_RW = attribute_wrapper(comms_annotation=["2:PCC", "2:RCU_monitor_rate_RW"], datatype=numpy.float64, access=AttrWriteType.READ_WRITE)
-
-    @log_exceptions()
-=======
     RCU_monitor_rate_RW = attribute_wrapper(comms_annotation=["2:PCC", "2:RCU_monitor_rate_RW"], datatype=numpy.float64,
                                             access=AttrWriteType.READ_WRITE)
 
->>>>>>> master
+    @log_exceptions()
     def delete_device(self):
         """Hook to delete resources allocated in init_device.
 
@@ -149,14 +140,6 @@ class PCC(hardware_device):
         self.OPCua_client = OPCUAConnection("opc.tcp://{}:{}/".format(self.OPC_Server_Name, self.OPC_Server_Port), "http://lofar.eu",
                                             self.OPC_Time_Out, self.Fault, self)
 
-        # map the attributes to the OPC ua comm client
-        for i in self.attr_list():
-            try:
-                i.set_comm_client(self.OPCua_client)
-            except:
-                pass
-
-        self.OPCua_client.start()
 
     # --------
     # Commands