Merge branch: Next-version

gregocgt · Jun 13, 2019 · 1c0aca3 · 1c0aca3
1 parent f6e9e4c
commit 1c0aca3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -10,11 +10,7 @@
 
 setup(
     name='SOLIDserverRest',
-<<<<<<< HEAD
-    version='1.5.2',
-=======
     version='1.6.01',
->>>>>>> next-version
     author='Gregory CUGAT',
     url='https://github.com/gregocgt/efficientip_Python_module_SOLIDserver',
     description='The SOLIDserverRest is a library to drive EfficientIP API',