actually fix merge errors

graspologic-org · Mar 23, 2023 · 3b6a77a · 3b6a77a
1 parent d35157a
commit 3b6a77a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -33,11 +33,7 @@ install_requires =
     hyppo>=0.3.2 # bug with lower versions and scipy>=1.8
     joblib>=0.17.0  # Older versions of joblib cause issue #806.  Transitive dependency of hyppo.
     matplotlib>=3.0.0,!=3.3.*,!=3.6.1
-<<<<<<< HEAD
     networkx>=2.1,<3.0
-=======
-    networkx>=2.1
->>>>>>> origin/main
     numpy>=1.8.1
     POT>=0.7.0
     seaborn>= 0.11.0