Fix merge conflicts

ros-controls · Jul 30, 2024 · 7bdfba7 · 7bdfba7
1 parent 2041a87
commit 7bdfba7
Showing 1 changed file with 2 additions and 6 deletions.
diff --git 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<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)
     {
       if (individual_hardware_info.type == actuator_type)