removed merge conflict text

devices/examples/HW_device_template.py

@@ -14,13 +14,8 @@ from tango.server import run
 from tango import AttrWriteType
 # Additional import
 
-<<<<<<< HEAD:devices/HW_device_template.py
-from src.attribute_wrapper import *
-from src.hardware_device import *
-=======
 from util.attribute_wrapper import attribute_wrapper
 from util.hardware_device import hardware_device
->>>>>>> master:devices/examples/HW_device_template.py
 
 __all__ = ["HW_dev"]