fix conflict

Signed-off-by: scepter914 <scepter914@gmail.com>
autowarefoundation · Sep 19, 2023 · 635f656 · 635f656
2 parents 74865f0 + 1506a94
commit 635f656
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
@@ -67,6 +67,8 @@
       <arg name="trust_distance" value="$(var trust_distance)"/>
       <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
       <arg name="use_roi_based_cluster" value="$(var use_roi_based_cluster)"/>
+      <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
+      <arg name="use_roi_based_cluster" value="$(var use_roi_based_cluster)"/>
       <arg name="input/radar" value="$(var input/radar)"/>
       <arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
     </include>
@@ -113,11 +115,15 @@
       <arg name="use_pointcloud_container" value="$(var use_pointcloud_container)"/>
       <arg name="container_name" value="$(var container_name)"/>
       <arg name="input/radar" value="$(var input/radar)"/>
+<<<<<<< HEAD
 <<<<<<< HEAD
       <arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
 =======
       <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
 >>>>>>> 8eeb11dff (refactor(perception): rearrange clustering pipeline (#4999))
+=======
+      <arg name="use_low_height_cropbox" value="$(var use_low_height_cropbox)"/>
+>>>>>>> main
     </include>
   </group>