Skip to content

Commit c47de14

Browse files
christophfroehlichmergify[bot]
authored andcommitted
Update path of GPL (#1994)
(cherry picked from commit f8c03cc) # Conflicts: # controller_manager/src/controller_manager.cpp
1 parent a9674aa commit c47de14

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

controller_manager/src/controller_manager.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
#include "rclcpp/rclcpp.hpp"
2929
#include "rclcpp_lifecycle/state.hpp"
3030

31+
<<<<<<< HEAD
32+
=======
33+
#include "controller_manager/controller_manager_parameters.hpp"
34+
35+
>>>>>>> f8c03cc (Update path of GPL (#1994))
3136
namespace // utility
3237
{
3338
static constexpr const char * kControllerInterfaceNamespace = "controller_interface";

0 commit comments

Comments
 (0)