Description: Fix accidental fluff from bad patch merge
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2025-01-21
Forwarded: not-needed


Index: cfgrib-0.9.15.0/tests/test_40_xarray_store.py
===================================================================
--- cfgrib-0.9.15.0.orig/tests/test_40_xarray_store.py
+++ cfgrib-0.9.15.0/tests/test_40_xarray_store.py
@@ -173,10 +173,7 @@ def test_open_datasets_different_step_ty
     assert res[1].cfrzr.attrs["GRIB_stepType"] == "avg"
 
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
+
 # ensure that the encoding of the coordinates is preserved
 def test_open_datasets_different_preserve_coordinate_encoding() -> None:
     res = xarray_store.open_datasets(TEST_DATA_DIFFERENT_STEP_TYPES)
@@ -190,7 +187,6 @@ def test_open_datasets_different_preserv
     assert "units" in res[1].valid_time.encoding
 
 
->>>>>>> upstream/0.9.13.0
 def test_open_dataset_steps_in_minutes() -> None:
     res = xarray_store.open_dataset(TEST_DATA_STEPS_IN_MINUTES)
 
@@ -201,7 +197,6 @@ def test_open_dataset_steps_in_minutes()
     assert steps[5] == pd.Timedelta("5 hours")
 
 
->>>>>>> upstream/0.9.12.0
 def test_alternating_scanning_mercator() -> None:
     ds = xarray_store.open_dataset(TEST_DATA_ALTERNATE_ROWS_MERCATOR)
     values = ds.variables["shww"].data