resolve conflicts

pangeo-data · Sep 1, 2023 · d46a1ae · d46a1ae
2 parents 10b4bbc + 6550084
commit d46a1ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -7,7 +7,7 @@ dependencies:
   - dask
   - numpy
   - scipy
-  - shapely>=2
+  - shapely
   - matplotlib
   - cartopy
   - cf_xarray>=0.3.1

diff --git a/ci/environment-upstream-dev.yml b/ci/environment-upstream-dev.yml
@@ -13,7 +13,7 @@ dependencies:
   - pydap
   - pytest
   - pytest-cov
-  - shapely>=2
+  - shapely
   - sparse>=0.8.0
   - pip:
       - git+https://github.com/pydata/xarray.git