Remove merge conflict... thanks VSCode
@@ -18,13 +18,7 @@ pytest-mock~=3.3
pytest-trio~=0.7
sortedcontainers
sniffio
-<<<<<<< HEAD
-trio==0.17.0
-trio_websocket==0.9.0
-urllib3==1.26.3
-=======
trio~=0.17
trio_websocket~=0.9
urllib3~=1.26
->>>>>>> 77051cd4cc ([py] Loosen version requirements on dependencies. Fixes #9312)
zipp
