Fix merge conflicts in pyproject.toml

digital-porous-media · Dec 4, 2024 · f6283bb · f6283bb
1 parent 75cbf6b
commit f6283bb
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -65,26 +65,15 @@ dev = [
     ]
 
 docs = [
-<<<<<<< HEAD
-=======
     "trimesh",
     "scikit-image",
->>>>>>> 3dfbfc1db602ad1d542da0ed78e2787f6f89c60b
     "myst-nb",
     "pydata-sphinx-theme",
     "sphinx",
     "sphinx-copybutton",
     "sphinx-design",
     "sphinx-autodoc-typehints"]
 
-<<<<<<< HEAD
-segment = [
-    "dpm_srm",
-    "dpm_srg"
-]
-
-=======
->>>>>>> 3dfbfc1db602ad1d542da0ed78e2787f6f89c60b
 [project.urls]
 Homepage = "https://github.com/digital-porous-media/"
 Repository = "https://github.com/digital-porous-media/dpm_tools"