change from thread_priority.hpp to realtime_helpers.hpp (#1829)

(cherry picked from commit 8fa60db) # Conflicts: # controller_manager/src/ros2_control_node.cpp
ros-controls · Nov 8, 2024 · 89ba791 · 89ba791
1 parent d91c155
commit 89ba791
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
@@ -20,8 +20,13 @@
 #include <thread>
 
 #include "controller_manager/controller_manager.hpp"
+<<<<<<< HEAD
 #include "rclcpp/rclcpp.hpp"
 #include "realtime_tools/thread_priority.hpp"
+=======
+#include "rclcpp/executors.hpp"
+#include "realtime_tools/realtime_helpers.hpp"
+>>>>>>> 8fa60db (change from thread_priority.hpp to realtime_helpers.hpp (#1829))
 
 using namespace std::chrono_literals;