We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent a9674aa commit c47de14Copy full SHA for c47de14
controller_manager/src/controller_manager.cpp
@@ -28,6 +28,11 @@
28
#include "rclcpp/rclcpp.hpp"
29
#include "rclcpp_lifecycle/state.hpp"
30
31
+<<<<<<< HEAD
32
+=======
33
+#include "controller_manager/controller_manager_parameters.hpp"
34
+
35
+>>>>>>> f8c03cc (Update path of GPL (#1994))
36
namespace // utility
37
{
38
static constexpr const char * kControllerInterfaceNamespace = "controller_interface";
0 commit comments