Try fixing conflict.

ros-controls · Jul 3, 2024 · 7fbec9c · 7fbec9c
1 parent 79210b9
commit 7fbec9c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/hardware_interface/src/resource_manager.cpp b/hardware_interface/src/resource_manager.cpp
@@ -684,13 +684,9 @@ 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);
   if (load_and_initialize_components)
-=======
-  std::lock_guard<std::recursive_mutex> 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<std::recursive_mutex> resource_guard(resources_lock_);
   {
     for (const auto & individual_hardware_info : hardware_info)
     {