Fix merge conflict

rly · Mar 31, 2024 · 3d25579 · 3d25579
1 parent 278d8c4
commit 3d25579
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -2,15 +2,6 @@
 # run tests, check code style, and generate documentation
 black==24.3.0
 codespell==2.2.6
-<<<<<<< Updated upstream
-coverage==7.3.2
-hdmf==3.10.0
-hdmf-docutils==0.4.7
-pre-commit==3.4.0
-pynwb==2.5.0
-pytest==7.4.2
-pytest-cov==4.1.0
-=======
 coverage==7.4.4
 hdmf==3.13.0
 hdmf-docutils==0.4.7
@@ -19,7 +10,6 @@ pynwb==2.6.0
 pytest==8.1.1
 pytest-cov==5.0.0
 pytest-subtests==0.12.1
->>>>>>> Stashed changes
 python-dateutil==2.8.2
 ruff==0.3.4
 tox==4.14.2