feat: rebase, fix merge conflicts

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
autowarefoundation · May 5, 2023 · a022b0b · a022b0b
1 parent 1b7ed30
commit a022b0b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml
@@ -93,7 +93,6 @@
     <arg name="run_out_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/run_out.param.yaml"/>
     <arg name="speed_bump_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/speed_bump.param.yaml"/>
     <arg name="out_of_lane_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/out_of_lane.param.yaml"/>
-    <arg name="invalid_lanelet_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/invalid_lanelet.param.yaml"/>
     <arg
       name="invalid_lanelet_param_path"
       value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/invalid_lanelet.param.yaml"