Unbreak dev

This commit is contained in:
Paulus Schoutsen 2016-12-18 17:35:42 -08:00
parent 4778ec4f94
commit 53dde0e4e1

View File

@ -3,7 +3,6 @@
MAJOR_VERSION = 0
MINOR_VERSION = 36
PATCH_VERSION = '0.dev0'
>>>>>>> master
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 4, 2)