fixed conflicts

Author: Manfred Eppe

src/tests/transport_test.py

@@ -1,7 +1,8 @@
 from __future__ import print_function
 from nluas.Transport import *
-import sys
+# Makes this work with both py2 and py3
 from six.moves import input
+import sys
 
 name, destination = sys.argv[1], sys.argv[2]