fixed 'illegal state transition' bug and off->initialise state bug

devices/clients/test_client.py

 from src.comms_client import *
 
+<<<<<<< HEAD
 import os
+=======
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
 
 # <class 'numpy.bool_'>
 
@@ -29,7 +32,11 @@ class example_client(CommClient):
         """
 		this function provides a location for the code neccecary to connect to the client
 		"""
+<<<<<<< HEAD
         self.streams.debug_stream(os.path.dirname(os.path.abspath(__file__)))
+=======
+
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
         self.streams.debug_stream("the example client doesn't actually connect to anything silly")
 
         self.connected = True  # set connected to true

devices/src/attribute_wrapper.py

@@ -11,6 +11,7 @@ logger = logging.getLogger()
 
 class attribute_wrapper(attribute):
     """
+<<<<<<< HEAD
     Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
     """
 
@@ -24,6 +25,16 @@ class attribute_wrapper(attribute):
         dims: dimensions of the
         init_value: value
         """
+=======
+		Wraps all the attributes in a wrapper class to manage most of the redundant code behind the scenes
+	"""
+
+    def __init__(self, comms_annotation=None, datatype=None, dims=(1,), access=AttrWriteType.READ, init_value=None, **kwargs):
+        """
+		wraps around the tango Attribute class. Provides an easier interface for 1d or 2d arrays. Also provides a way to abstract
+		managing the communications interface.
+		"""
+>>>>>>> 99e3d08... fixed 'illegal state transition' bug and off->initialise state bug
 
         # ensure the type is a numpy array
         if "numpy" not in str(datatype) and datatype != str: