remove leftover conflicts

astroquery/mast/tests/test_mast_remote.py

@@ -400,21 +400,8 @@ def test_observations_download_file(self, tmp_path):
         # should download to current working directory
         result = mast.Observations.download_file(uri)
         assert result == ('COMPLETE', None, None)
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         assert os.path.exists(Path(os.getcwd(), filename))
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         Path.unlink(filename)  # clean up file
->>>>>>> a8615f1f (space before comment)
-=======
-        assert os.path.exists(Path(os.getcwd(), filename))
->>>>>>> 8033190f (update changes file, add to test case)
-=======
-        Path.unlink(filename) # clean up file
->>>>>>> 4013186e (clean up file from tests, make logic simpler in download_file)
 
         # download with directory as local_path parameter
         local_path = Path(tmp_path, filename)
@@ -427,11 +414,6 @@ def test_observations_download_file(self, tmp_path):
         result = mast.Observations.download_file(uri, local_path=local_path_file)
         assert result == ('COMPLETE', None, None)
         assert os.path.exists(local_path_file)
-<<<<<<< HEAD
->>>>>>> 8447eab8 (delete blank line for style)
-=======
-
->>>>>>> 8033190f (update changes file, add to test case)
 
     @pytest.mark.parametrize("test_data_uri, expected_cloud_uri", [
         ("mast:HST/product/u24r0102t_c1f.fits",