From 7dcc76810271dcb5bb77f0fc29fdd500d19be8b8 Mon Sep 17 00:00:00 2001
From: uriii3 <oriolrv689@gmail.com>
Date: Wed, 31 Jul 2024 11:48:53 +0200
Subject: [PATCH] deleting the missing heads

---
 poetry.lock                          |  5 +--
 tests/test_command_line_interface.py | 54 ----------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5a4116dd..d83563ff 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1941,8 +1941,5 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools",
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.13"
-<<<<<<< HEAD
-content-hash = "df93116d25a101d3f319a1e497b4436a09702719616a853437524aa68acf47bd"
-=======
+
 content-hash = "f781539aa6604250d8715e3c6ef09165d031fbb95565f65e4368e41db7c50290"
->>>>>>> 95d6892 (chore: refactor to stop using the cache (#95))
diff --git a/tests/test_command_line_interface.py b/tests/test_command_line_interface.py
index deaee3b9..63d341a8 100644
--- a/tests/test_command_line_interface.py
+++ b/tests/test_command_line_interface.py
@@ -1160,43 +1160,6 @@ def then_I_can_see_the_arco_geo_series_service_is_choosen(self):
             in self.output.stderr
         )
 
-<<<<<<< HEAD
-    def test_subset_with_dataset_id_and_url(self):
-        command = [
-            "copernicusmarine",
-            "subset",
-            "-i",
-            "cmems_mod_arc_bgc_anfc_ecosmo_P1M-m",
-            "-u",
-            "https://nrt.cmems-du.eu/thredds/dodsC/METOFFICE-GLO-SST-L4-NRT-OBS-SST-V2",
-            "--variable",
-            "thetao",
-        ]
-
-        self.output = execute_in_terminal(command)
-
-        assert self.output.returncode == 1
-        assert (
-            b"Must specify only one of 'dataset_url' or 'dataset_id' options"
-        ) in self.output.stderr
-
-    def test_no_traceback_is_printed_on_dataset_url_error(self):
-        command = [
-            "copernicusmarine",
-            "get",
-            "--dataset-url",
-            "https://s3.waw3-1.cloudferro.com/mdl-arco-time-013/arco/"
-            "GLOBAL_ANALYSISFORECAST_PHY_XXXXXXX/"
-            "cmems_mod_glo_phy_anfc_0.083deg_P1D-m/2023",
-        ]
-
-        self.output = execute_in_terminal(command)
-
-        assert self.output.returncode == 1
-        assert b"Traceback" not in self.output.stderr
-
-=======
->>>>>>> 95d6892 (chore: refactor to stop using the cache (#95))
     def test_get_2023_08_original_files(self):
         command = [
             "copernicusmarine",
@@ -1244,23 +1207,6 @@ def test_subset_with_chunking(self, tmp_path):
 
         assert self.output.returncode == 0
 
-<<<<<<< HEAD
-    def test_dataset_url_suffix_path_are_used_as_filter(self):
-        command = [
-            "copernicusmarine",
-            "get",
-            "--dataset-url",
-            "https://s3.waw3-1.cloudferro.com/mdl-native-14/native/"
-            "GLOBAL_ANALYSISFORECAST_PHY_001_024/"
-            "cmems_mod_glo_phy_anfc_0.083deg_P1D-m_202406/2023/11",
-        ]
-
-        self.output = execute_in_terminal(command)
-
-        assert b"Printed 20 out of 30 files" in self.output.stderr
-
-=======
->>>>>>> 95d6892 (chore: refactor to stop using the cache (#95))
     def test_short_option_for_copernicus_marine_command_helper(self):
         short_option_command = [
             "copernicusmarine",