Update path of GPL (#1994)

(cherry picked from commit f8c03cc) # Conflicts: # controller_manager/src/controller_manager.cpp
ros-controls · Jan 15, 2025 · c47de14 · c47de14
1 parent a9674aa
commit c47de14
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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";