Merge branch 'master' into integrate/pal_statistics

saikishor · web-flow · commit 0904ee17a923 · 2025-01-17T16:41:24.000+01:00
diff --git a/controller_manager/src/controller_manager.cpp b/controller_manager/src/controller_manager.cpp
@@ -29,7 +29,7 @@
 #include "rclcpp/version.h"
 #include "rclcpp_lifecycle/state.hpp"
 
-#include "controller_manager_parameters.hpp"
+#include "controller_manager/controller_manager_parameters.hpp"
 
 namespace  // utility
 {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`#include "rclcpp/version.h"`
`30`	`30`	`#include "rclcpp_lifecycle/state.hpp"`
`31`	`31`
`32`		`-#include "controller_manager_parameters.hpp"`
	`32`	`+#include "controller_manager/controller_manager_parameters.hpp"`
`33`	`33`
`34`	`34`	`namespace // utility`
`35`	`35`	`{`