bump to 0.8.3

diff --git a/setup.py b/setup.py
index 077851bc60b00a2c92b430d3b44261d20f68a725..39e1e4cf9a39873a1814cb5fef14013147a3d170 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,11 @@ 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',