Remove merge conflict... thanks VSCode

AutomatedTester · AutomatedTester · commit 0849604f66a3 · 2021-03-22T09:55:54.000Z
diff --git a/py/requirements.txt b/py/requirements.txt
@@ -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
