From e49f6c5256fb513e75ee7374f70ca1c990e46957 Mon Sep 17 00:00:00 2001
From: owinter <olivier.winter@hotmail.fr>
Date: Tue, 2 Jul 2024 19:16:38 +0100
Subject: [PATCH] fix merge

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index f301cde..13c26dd 100644
--- 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,