Bump version number

fralau · Aug 29, 2021 · 3608781 · 3608781
1 parent ce62530
commit 3608781
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -2,11 +2,7 @@
 from setuptools import setup, find_packages
 
 
-<<<<<<< HEAD
-VERSION = '0.5.2'
-=======
 VERSION = '0.6.0'
->>>>>>> 149a4b100454a05a4f14cccfd2acca605b0486e5
 
 def readme():
     """print long description"""