From 1debd6e3fb52aeb59028f08cdf1eb37389fc25a2 Mon Sep 17 00:00:00 2001
From: thijs snijder <snijder@astron.nl>
Date: Thu, 6 May 2021 09:53:44 +0200
Subject: [PATCH] removed merge conflict text

---
 devices/examples/HW_device_template.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/devices/examples/HW_device_template.py b/devices/examples/HW_device_template.py
index 92ff6a32a..dd6cad99b 100644
--- a/devices/examples/HW_device_template.py
+++ b/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"]
 
-- 
GitLab