Skip to content
Snippets Groups Projects
Commit 32a457a3 authored by Steven Macenski's avatar Steven Macenski
Browse files

fix merge issue

parent 6a16cfde
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
nav2_bringup/bringup/rviz/nav2_default_view.rviz
+ 0
− 1
View file @ 32a457a3
......@@ -425,7 +425,6 @@ Visualization Manager:
Value: true
Enabled: true
Name: Controller
<<<<<<< HEAD
- Class: rviz_common/Group
Displays:
- Class: rviz_default_plugins/Image
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment