Fix

python · Dec 7, 2024 · 44e07a9 · 44e07a9
1 parent 359bf4b
commit 44e07a9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -1,11 +1,7 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
 mypy==1.13.0
-<<<<<<< HEAD
-pyright==1.1.373
-=======
 pyright==1.1.390    
->>>>>>> 45e561975 (upgrade pyright)
 # pytype can be installed on Windows, but requires building wheels, let's not do that on the CI
 pytype==2024.10.11; platform_system != "Windows" and python_version >= "3.10" and python_version < "3.13"