Remove forgotten remnant of conflict

equinor · Nov 27, 2023 · c07ed08 · c07ed08
1 parent e338c63
commit c07ed08
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -32,11 +32,7 @@ dev = ["pytest", "black", "flake8"]
 # package-dir = { "" = "src" }
 # include-package-data = true
 # platforms = ["any"]
-<<<<<<< HEAD
 #
-=======
-
->>>>>>> 0cc9c1c (Comment out tool setuptools)
 # [tool.setuptools.packages.find]
 # where = ["src"]