From c47de14f380ded936ceb9de28f0d873c4e70fd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Wed, 15 Jan 2025 23:38:35 +0100 Subject: [PATCH] Update path of GPL (#1994) (cherry picked from commit f8c03cc7cca969a425e536c2cbfbf0bbc664d9fe) # Conflicts: # controller_manager/src/controller_manager.cpp --- controller_manager/src/controller_manager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp index 700456aac8..9ff2561a8f 100644 --- a/controller_manager/src/controller_manager.cpp +++ b/controller_manager/src/controller_manager.cpp @@ -28,6 +28,11 @@ #include "rclcpp/rclcpp.hpp" #include "rclcpp_lifecycle/state.hpp" +<<<<<<< HEAD +======= +#include "controller_manager/controller_manager_parameters.hpp" + +>>>>>>> f8c03cc (Update path of GPL (#1994)) namespace // utility { static constexpr const char * kControllerInterfaceNamespace = "controller_interface";