fix reqs merge

databio · Jan 25, 2022 · 336cc5e · 336cc5e
1 parent f51efc7
commit 336cc5e
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt
@@ -1,15 +1,7 @@
 mock==2.0.0
-<<<<<<< HEAD:requirements/reqs-test.txt
 pytest>=4.6.9
 pytest-cov>=2.8.1
 hypothesis==4.38.0
 coveralls
 veracitools
-=======
-pytest>=4.2.1
-hypothesis
-coveralls>=1.1
-pytest-cov==2.6.1
-veracitools
 pytest-remotedata
->>>>>>> master:requirements/requirements-test.txt