fix merge

EPFL-LCN · Nov 17, 2023 · caa6d60 · caa6d60
1 parent 5f3e5d2
commit caa6d60
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -1,10 +1,6 @@
 from setuptools import find_packages, setup
 from subprocess import check_call
-<<<<<<< HEAD
 import sys
-=======
-import sys 
->>>>>>> 0ee589b2d85410cc044279d06bf93e277f182d87
 
 
 def meta_data():