fix: merge deploy back into devel

This commit is contained in:
mzwiessele 2018-02-22 16:41:48 +01:00
commit cf25801e85
2 changed files with 4 additions and 21 deletions

View file

@ -1,5 +1,9 @@
[bumpversion]
<<<<<<< HEAD
current_version = 1.8.6
=======
current_version = 1.8.5
>>>>>>> deploy
tag = True
commit = True
@ -12,4 +16,3 @@ upload-dir = doc/build/html
[medatdata]
description-file = README.rst