Merge branch 'margriet_257_fix_gdal_3.4' of github.com:nens/threedigr…

…id-builder into margriet_257_fix_gdal_3.4
nens · Feb 15, 2024 · 8385747 · 8385747
2 parents 61bf0e2 + 17efdd6
commit 8385747
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -66,7 +66,11 @@ jobs:
           - python: '3.12'
             os: ubuntu-latest
             setuptools: setuptools==69.*
+<<<<<<< HEAD
             numpy: numpy==1.24.*
+=======
+            numpy: numpy==1.25.*
+>>>>>>> 17efdd6db499e774826839fedad48417056a058c
             pins: ""
             display_name: "latest"
             extras: "[test,gridadmin]"