Skip to content

Commit c80fcdb

Browse files
committed
merge main branch
Signed-off-by: scepter914 <scepter914@gmail.com>
1 parent e5f8d64 commit c80fcdb

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml

-4
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,8 @@
176176
<include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
177177
<arg name="input/radar" value="$(var input/radar)"/>
178178
<arg name="output/objects" value="far_objects"/>
179-
<<<<<<< HEAD
180179
<arg name="radar_crossing_objects_noise_filter_param_path" value="$(var object_recognition_detection_radar_crossing_objects_noise_filter_param_path)"/>
181-
||||||| 57cf88d2b8
182-
=======
183180
<arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)"/>
184-
>>>>>>> main
185181
<arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
186182
<arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
187183
</include>

0 commit comments

Comments
 (0)