Fix the launch_utils regression (#1909)

(cherry picked from commit 3052b58) # Conflicts: # controller_manager/controller_manager/launch_utils.py
ros-controls · Dec 4, 2024 · a773801 · a773801
1 parent 63269d4
commit a773801
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/controller_manager/controller_manager/launch_utils.py b/controller_manager/controller_manager/launch_utils.py
@@ -148,7 +148,10 @@ def generate_load_controller_launch_description(
     controller_params_files = [controller_params_file] if controller_params_file else None
     return generate_controllers_spawner_launch_description(
         controller_names=[controller_name],
+<<<<<<< HEAD
         controller_type=controller_type,
+=======
+>>>>>>> 3052b58 (Fix the launch_utils regression (#1909))
         controller_params_files=controller_params_files,
         extra_spawner_args=extra_spawner_args,
     )