Commit 22029a71 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed merge error.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent 86922c22
Pipeline #4288 passed with stages
in 1 minute and 12 seconds
<<<<<<< py_tools_ds/version.py
# py_tools_ds
#
# Copyright (C) 2019 Daniel Scheffler (GFZ Potsdam, daniel.scheffler@gfz-potsdam.de)
......@@ -22,7 +21,3 @@
__version__ = '0.14.19'
__versionalias__ = '20190722_01'
=======
__version__ = '0.14.18'
__versionalias__ = '20190614_01'
>>>>>>> py_tools_ds/version.py
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment