Corrected pyproject conflicts.

nsidc · Apr 8, 2024 · 5cabd1e · 5cabd1e
1 parent 7ea1792
commit 5cabd1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -78,11 +78,8 @@ h5netcdf = ">=0.11"
 dask = ">=2022.1"
 pyproj = ">=3.5.0"
 bump-my-version = ">=0.10.0"
-<<<<<<< HEAD
 vcrpy = ">=6.0.1"
-=======
-vcrpy = "^6.0.1"
->>>>>>> 5ba65ca (Add VCR tests.)
+
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]