Update test_twopoint_difference.py

spacetelescope · Dec 28, 2023 · 93d3b56 · 93d3b56
1 parent 541ceed
commit 93d3b56
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tests/test_twopoint_difference.py b/tests/test_twopoint_difference.py
@@ -1,14 +1,9 @@
 import numpy as np
-<<<<<<< Updated upstream
 import pytest
 
 from stcal.jump.twopoint_difference import calc_med_first_diffs, find_crs
 
 DQFLAGS = {"JUMP_DET": 4, "SATURATED": 2, "DO_NOT_USE": 1}
-=======
-from astropy.io import fits
-from stcal.jump.twopoint_difference import find_crs, calc_med_first_diffs
->>>>>>> Stashed changes
 
 
 @pytest.fixture()