use version file, bump to 0.9.1

diff --git a/setup.py b/setup.py
index f3f0f4a8e89d307d4f28b8dd1ddf704b5c8f1003..fb88d1349a05850e00a0940ccf0a154ec37b39f6 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,7 @@ setup(
     long_description=open('README.rst').read(),
     author="Guillaume Pellerin",
     author_email="yomguy@parisson.com",
-<<<<<<< HEAD
     version='0.9.2',
-=======
-    version='0.8.3',
->>>>>>> d538af1 (bump to 0.8.3)
     install_requires=[
         'setuptools',
         'wheel',