From 42625a8dc7fce0b10d86ed5e6785292829b93dd5 Mon Sep 17 00:00:00 2001
From: Peter Liao <peterliao2004@gmail.com>
Date: Fri, 31 Jan 2025 16:02:37 +1000
Subject: [PATCH] sync

---
 .../bringup/launch/qev3d_controller_launch.py | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/control/ros2_control/bringup/launch/qev3d_controller_launch.py b/src/control/ros2_control/bringup/launch/qev3d_controller_launch.py
index ad47f83bc..a102e624f 100644
--- a/src/control/ros2_control/bringup/launch/qev3d_controller_launch.py
+++ b/src/control/ros2_control/bringup/launch/qev3d_controller_launch.py
@@ -8,32 +8,27 @@
 
 
 def generate_launch_description():
-<<<<<<< HEAD:src/control/ros2_control/bringup/launch/qev-3d_controller_launch.py
-      # List of arguments to be declared into Node  
-      declared_arguments = []
+    # List of arguments to be declared into Node
+    declared_arguments = []
 
-      # Open Rviz2 GUI
-      declared_arguments.append(
-            DeclareLaunchArgument(
-                  "gui",
-                  default_value="true", # Default value is true
-                  description="Start RViz2 automatically with this launch file.",
-            )
-      )
+    # Open Rviz2 GUI
+    declared_arguments.append(
+        DeclareLaunchArgument(
+            "gui",
+            default_value="true",  # Default value is true
+            description="Start RViz2 automatically with this launch file.",
+        )
+    )
 
-      # Remap odometry TF from the steering controller to the TF tree
-      declared_arguments.append( 
-            DeclareLaunchArgument(
-                  "remap_odometry_tf",
-                  default_value="false", # Default value is false
-                  description="Remap odometry TF from the steering controller to the TF tree.",
-            )
-      )
+    # Remap odometry TF from the steering controller to the TF tree
+    declared_arguments.append(
+        DeclareLaunchArgument(
+            "remap_odometry_tf",
+            default_value="false",  # Default value is false
+            description="Remap odometry TF from the steering controller to the TF tree.",
+        )
+    )
 
-      # Arguments Initialization
-      gui = LaunchConfiguration("gui")
-      remap_odometry_tf = LaunchConfiguration("remap_odometry_tf")
-=======
-    # List of arguments to be declared into Node
-    declared_arguments = []
->>>>>>> cea9496a927535100acf4a8bec037947a60b01a3:src/control/ros2_control/bringup/launch/qev3d_controller_launch.py
+    # Arguments Initialization
+    gui = LaunchConfiguration("gui")
+    remap_odometry_tf = LaunchConfiguration("remap_odometry_tf")