feat: fixing merge conflicts

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
autowarefoundation · May 10, 2023 · c6f0ed8 · c6f0ed8
1 parent 1e92de3
commit c6f0ed8
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -1921,8 +1921,6 @@ Visualization Manager:
                             Reliability Policy: Reliable
                             Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/dynamic_avoidance
                           Value: false
-                      Enabled: false
-                      Name: DebugMarker
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
                           Name: NoDrivableLane