remove conflict markers

alexander-alderman-webb · alexander-alderman-webb · commit f7ea28833258 · 2026-06-23T15:58:42.000+02:00
diff --git a/requirements-testing.txt b/requirements-testing.txt
@@ -7,11 +7,6 @@ jsonschema
 executing
 asttokens
 responses
-<<<<<<< HEAD
-pysocks
-=======
-socksio
->>>>>>> master
 httpcore[http2]
 setuptools
 docker
