TYPO: remove extra line

ColmTalbot · Jan 31, 2024 · e3d303d · e3d303d
1 parent 9acc84e
commit e3d303d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/test/interpolate_test.py b/test/interpolate_test.py
@@ -85,7 +85,6 @@ def test_single_complex(interpolant):
     assert spl(X_BOUNDS[0]) == y_values[0]
 
 
-<<<<<<< HEAD
 @pytest.mark.parametrize("interpolant", interpolants)
 def test_interpolation_at_lower_bound(interpolant):
     x_values = np.linspace(*X_BOUNDS, 10)