From 7bdfba7f48a1b613de059256143aff7b3eb55ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 30 Jul 2024 21:14:54 +0200 Subject: [PATCH] Fix merge conflicts --- hardware_interface/src/resource_manager.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hardware_interface/src/resource_manager.cpp b/hardware_interface/src/resource_manager.cpp index 66e4805ca3..2680f4ff74 100644 --- a/hardware_interface/src/resource_manager.cpp +++ b/hardware_interface/src/resource_manager.cpp @@ -764,14 +764,10 @@ void ResourceManager::load_urdf( const std::string sensor_type = "sensor"; const std::string actuator_type = "actuator"; -<<<<<<< HEAD - const auto hardware_info = hardware_interface::parse_control_resources_from_urdf(urdf); + const auto hardware_info = hardware_interface::parse_control_resources_from_urdf(urdf); if (load_and_initialize_components) -======= - std::lock_guard resource_guard(resources_lock_); - for (const auto & individual_hardware_info : hardware_info) ->>>>>>> 25f2c97 (Add resources_lock_ lock_guards to avoid race condition when loading robot_description through topic (#1451)) { + std::lock_guard resource_guard(resources_lock_); for (const auto & individual_hardware_info : hardware_info) { if (individual_hardware_info.type == actuator_type)