Fix merge conflicts in r6bot_controller.launch.py

ros-controls · Aug 12, 2024 · 6665a23 · 6665a23
1 parent 3016616
commit 6665a23
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/example_7/bringup/launch/r6bot_controller.launch.py b/example_7/bringup/launch/r6bot_controller.launch.py
@@ -63,16 +63,9 @@ def generate_launch_description():
         package="controller_manager",
         executable="ros2_control_node",
         parameters=[robot_controllers],
-<<<<<<< HEAD
         remappings=[
             ("~/robot_description", "/robot_description"),
-            (
-                "/forward_position_controller/commands",
-                "/position_commands",
-            ),
         ],
-=======
->>>>>>> 71a86bd (Fix topic remappings (#565))
         output="both",
     )
     robot_state_pub_node = Node(