fix: fix pyproject merge

jnsbck · jnsbck · commit 7048b7693379 · 2024-11-22T15:07:06.000+01:00
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]
