fix merge

int-brain-lab · Jul 2, 2024 · e49f6c5 · e49f6c5
1 parent 2a0bc1f
commit e49f6c5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -8,11 +8,7 @@
 
 setuptools.setup(
     name="ibl-neuropixel",
-<<<<<<< Updated upstream
-    version="1.1.0a02",
-=======
     version="1.1.1",
->>>>>>> Stashed changes
     author="The International Brain Laboratory",
     description="Collection of tools for Neuropixel 1.0 and 2.0 probes data",
     long_description=long_description,