Update __version__.py

beniroquai · beniroquai · commit 9e21a9475a21 · 2022-11-02T23:46:10.000+01:00
diff --git a/uc2rest/__version__.py b/uc2rest/__version__.py
@@ -6,7 +6,11 @@
 
 __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'
