From c2d1479e74fbd529bae8d606c9419485d02472a5 Mon Sep 17 00:00:00 2001
From: Sai Kishor Kothakota <sai.kishor@pal-robotics.com>
Date: Fri, 8 Nov 2024 11:18:44 +0100
Subject: [PATCH] change from thread_priority.hpp to realtime_helpers.hpp
 (#1829)

(cherry picked from commit 8fa60dba374563077d221d2395867ce1906c41fe)

# Conflicts:
#	controller_manager/src/ros2_control_node.cpp
---
 controller_manager/src/ros2_control_node.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
index 904f9af08e..9f1f48ed42 100644
--- 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;