From c6f0ed8d017d184eac7662b2100e72d2c5f4e690 Mon Sep 17 00:00:00 2001
From: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
Date: Wed, 10 May 2023 18:11:25 +0300
Subject: [PATCH] feat: fixing merge conflicts

Signed-off-by: AhmedEbrahim <ahmed.a.d.ebrahim@gmail.com>
---
 autoware_launch/rviz/autoware.rviz | 2 --
 1 file changed, 2 deletions(-)

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
index 4dd0de50b1..a3db702f99 100644
--- 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