File tree 1 file changed +0
-4
lines changed
launch/tier4_perception_launch/launch/object_recognition/detection
1 file changed +0
-4
lines changed Original file line number Diff line number Diff line change 176
176
<include file =" $(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml" >
177
177
<arg name =" input/radar" value =" $(var input/radar)" />
178
178
<arg name =" output/objects" value =" far_objects" />
179
- <<<<<<< HEAD
180
179
<arg name =" radar_crossing_objects_noise_filter_param_path" value =" $(var object_recognition_detection_radar_crossing_objects_noise_filter_param_path)" />
181
- ||||||| 57cf88d2b8
182
- =======
183
180
<arg name =" object_range_splitter_param_path" value =" $(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)" />
184
- >>>>>>> main
185
181
<arg name =" radar_lanelet_filtering_range_param" value =" $(var radar_lanelet_filtering_range_param)" />
186
182
<arg name =" radar_object_clustering_param_path" value =" $(var radar_object_clustering_param_path)" />
187
183
</include >
You can’t perform that action at this time.
0 commit comments