Skip to content
Snippets Groups Projects
Commit 1debd6e3 authored by Taya Snijder's avatar Taya Snijder
Browse files

removed merge conflict text

parent 6f0ce36a
No related branches found
No related tags found
1 merge request!24Resolve #2021 "04 16 branched from master ini file device"
This commit is part of merge request !24. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
devices/examples/HW_device_template.py
+ 0
− 5
View file @ 1debd6e3
......@@ -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"]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment