fix log

spacetelescope · May 30, 2024 · 58ca7b7 · 58ca7b7
1 parent bf1aeec
commit 58ca7b7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -157,13 +157,6 @@ resample_spec
 
 - Populate the wavelength array in resampled `Slit` and `MultiSlit` models. [#8374]
 
-<<<<<<< HEAD
-=======
-- Fix a bug resulting in large WCS errors in the resampled image's WCS
-when the slit was closely aligned with the RA direction
-  sky). [#8511]
-
->>>>>>> 56f965fc9 (Update CHANGES.rst)
 - Change `fillval` parameter default from INDEF to NaN [#8488]
 
 - Fix a bug resulting in large WCS errors in the resampled image's WCS