fix: fix pyproject merge

jaxleyverse · Nov 22, 2024 · 7048b76 · 7048b76
1 parent 9e52fbb
commit 7048b76
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,10 +69,7 @@ dev = [
 [tool.pytest.ini_options]
 markers = [
     "slow: marks tests as slow (T > 10s)",
-<<<<<<< HEAD
-=======
     "regression: marks regression tests",
->>>>>>> wip: new baselines
 ]
 
 [tool.isort]