Update __version__.py

Author: beniroquai

uc2rest/__version__.py

@@ -6,12 +6,8 @@
 
 __title__ = 'UC2 REST'
 __description__ = 'This pacage will help you to drive the ESP32-driven microscopy control modules from UC2'
-<<<<<<< Updated upstream
 __version__ = '0.1.0.13'
-=======
-__version__ = 'develop'
->>>>>>> Stashed changes
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'
-__url__ = 'https://github.com/openUC2/UC2-REST'
+__url__ = 'https://github.com/openUC2/UC2-REST'