Fix a bad rebase

spacetelescope · Jan 21, 2025 · cc53ecc · cc53ecc
1 parent c06bdec
commit cc53ecc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/romancal/resample/tests/test_resample.py b/romancal/resample/tests/test_resample.py
@@ -1039,11 +1039,7 @@ def test_populate_mosaic_basic_different_observations(
         rotation=0,
         shape=None,
         crpix=(0, 0),
-<<<<<<< HEAD
         crval=(30, 45),
-=======
-        crval=(10, 0),
->>>>>>> 001c238 (Adjust crval in resample tests to get overlap with input)
     )
     output_model = maker_utils.mk_datamodel(
         datamodels.MosaicModel, shape=tuple(output_wcs.array_shape)