fixup! Add free-threaded job

hugovk · Jul 3, 2024 · b675a69 · b675a69
1 parent 0129a59
commit b675a69
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.ci/install.sh b/.ci/install.sh
@@ -37,7 +37,6 @@ python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
 
 if [[ $(uname) != CYGWIN* ]]; then
-<<<<<<< HEAD
     python3 -m pip install numpy
     # TODO Update condition when NumPy supports free-threading
     if ! [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then python3 -m pip install numpy ; fi