From c80fcdb8607d7c26daff778f14494d8b145dbc51 Mon Sep 17 00:00:00 2001
From: scepter914 <scepter914@gmail.com>
Date: Mon, 29 Jan 2024 19:17:31 +0900
Subject: [PATCH] merge main branch

Signed-off-by: scepter914 <scepter914@gmail.com>
---
 .../launch/object_recognition/detection/detection.launch.xml  | 4 ----
 1 file changed, 4 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
index 368effb181a9c..8b635bcbdc223 100644
--- a/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
+++ b/launch/tier4_perception_launch/launch/object_recognition/detection/detection.launch.xml
@@ -176,12 +176,8 @@
       <include file="$(find-pkg-share tier4_perception_launch)/launch/object_recognition/detection/detector/radar_detector.launch.xml">
         <arg name="input/radar" value="$(var input/radar)"/>
         <arg name="output/objects" value="far_objects"/>
-<<<<<<< HEAD
         <arg name="radar_crossing_objects_noise_filter_param_path" value="$(var object_recognition_detection_radar_crossing_objects_noise_filter_param_path)"/>
-||||||| 57cf88d2b8
-=======
         <arg name="object_range_splitter_param_path" value="$(var object_recognition_detection_object_range_splitter_radar_fusion_param_path)"/>
->>>>>>> main
         <arg name="radar_lanelet_filtering_range_param" value="$(var radar_lanelet_filtering_range_param)"/>
         <arg name="radar_object_clustering_param_path" value="$(var radar_object_clustering_param_path)"/>
       </include>