diff --git a/tests/end_to_end/bundle_pds4.xml b/tests/end_to_end/bundle_pds4.xml index 6d719e2a..9aba9135 100644 --- a/tests/end_to_end/bundle_pds4.xml +++ b/tests/end_to_end/bundle_pds4.xml @@ -2,15 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://pds.nasa.gov/pds4/pds/v1"> -<<<<<<< Updated upstream -{{random_lid}} -1.0 InSight Cameras Bundle -======= urn:nasa:pds:insight_cameras 54.0 InSight Cameras XXXX Example Bundle ->>>>>>> Stashed changes 1.11.1.0 Product_Bundle @@ -26,10 +21,6 @@ InSight Cameras Experiment Data Record (EDR) and Reduced Data Record (RDR) Data Products -<<<<<<< Updated upstream -======= -10.13143/43g3-kk20 ->>>>>>> Stashed changes