From 93d3b56f69b45d1ddacbaba9b7f27dce8f472747 Mon Sep 17 00:00:00 2001
From: Mike Regan <mregan@stsci.edu>
Date: Thu, 28 Dec 2023 14:20:51 -0500
Subject: [PATCH] Update test_twopoint_difference.py

---
 tests/test_twopoint_difference.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/test_twopoint_difference.py b/tests/test_twopoint_difference.py
index 87bb79d3..c6443bc7 100644
--- 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()