.

Author: alexander-alderman-webb

requirements-testing.txt

@@ -1,13 +1,6 @@
 pytest>=6.0.0
 pytest-cov
 pytest-forked
-<<<<<<< HEAD
-pytest-localserver
-pytest-watch
-jsonschema
-=======
-pytest-timeout
->>>>>>> master
 executing
 asttokens
 responses

scripts/populate_tox/tox.jinja

@@ -83,11 +83,8 @@ deps =
     common: jsonschema
     common: pysocks
     common: pytest-asyncio
-<<<<<<< HEAD
     common: pytest-timeout
-=======
     common: pytest_localserver
->>>>>>> master
     common: httpcore[asyncio]
     common: socksio
     common: werkzeug
@@ -111,11 +108,8 @@ deps =
     gevent: jsonschema
     gevent: pysocks
     gevent: pytest-asyncio
-<<<<<<< HEAD
     gevent: pytest-timeout
-=======
     gevent: pytest_localserver
->>>>>>> master
     gevent: setuptools<82
     gevent: socksio
     gevent: werkzeug