fix: pkg: merge in setup

This commit is contained in:
mzwiessele 2018-02-22 17:05:58 +01:00
parent cf25801e85
commit 45faf1f1e2

View file

@ -1,9 +1,5 @@
[bumpversion]
<<<<<<< HEAD
current_version = 1.8.6
=======
current_version = 1.8.5
>>>>>>> deploy
tag = True
commit = True