fix conflict resolution

Signed-off-by: Kento Yabuuchi <[email protected]>
tier4 · Oct 7, 2024 · 17621ee · 17621ee
1 parent 8e6a0b8
commit 17621ee
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/aip_xx1_gen2_launch/launch/gnss.launch.xml b/aip_xx1_gen2_launch/launch/gnss.launch.xml
@@ -32,7 +32,6 @@
 
     <!-- NavSatFix to MGRS Pose -->
     <include file="$(find-pkg-share autoware_gnss_poser)/launch/gnss_poser.launch.xml">
-    <include file="$(find-pkg-share gnss_poser)/launch/gnss_poser.launch.xml">
       <arg name="input_topic_fix" value="$(var navsatfix_topic_name)" />
       <arg name="input_topic_navpvt" value="$(var navpvt_topic_name)" />
 

diff --git a/aip_xx1_gen2_launch/launch/radar.launch.xml b/aip_xx1_gen2_launch/launch/radar.launch.xml
@@ -56,11 +56,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -92,11 +88,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -128,11 +120,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -164,11 +152,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -200,11 +184,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -236,11 +216,7 @@
           <arg name="new_plug_orientation" value="0"/>
       </include>
 
-<<<<<<< HEAD
       <include file="$(find-pkg-share autoware_radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
-=======
-      <include file="$(find-pkg-share radar_tracks_msgs_converter)/launch/radar_tracks_msgs_converter.launch.xml">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
         <arg name="input/radar_objects" value="objects_raw"/>
         <arg name="input/odometry" value="$(var odometry_topic)"/>
         <arg name="output/radar_detected_objects" value="detected_objects"/>
@@ -251,11 +227,7 @@
 
     <!-- merge radar objects -->
     <let name="merger_param_path" value="$(find-pkg-share aip_xx1_gen2_launch)/config/radar_simple_object_merger.param.yaml"/>
-<<<<<<< HEAD
     <node pkg="autoware_simple_object_merger" exec="simple_object_merger_node" name="simple_object_merger" output="screen">
-=======
-    <node pkg="simple_object_merger" exec="simple_object_merger_node" name="simple_object_merger" output="screen">
->>>>>>> 0e294a7 (feat(aip_xx1_description): update for xx1 gen2 (#210))
       <remap from="~/output/objects" to="detected_objects"/>
       <param from="$(var merger_param_path)"/>
     </node>