Resolve conflicts

hardware_interface/CMakeLists.txt

@@ -138,22 +138,6 @@ if(BUILD_TESTING)
   target_link_libraries(test_component_parser ${PROJECT_NAME})
   ament_target_dependencies(test_component_parser ros2_control_test_assets)
 
-<<<<<<< HEAD
-  add_library(test_components SHARED
-    test/test_components/test_actuator.cpp
-    test/test_components/test_sensor.cpp
-    test/test_components/test_system.cpp)
-  target_link_libraries(test_components ${PROJECT_NAME})
-  ament_target_dependencies(test_components
-    pluginlib)
-  install(TARGETS test_components
-    DESTINATION lib
-  )
-  pluginlib_export_plugin_description_file(
-    ${PROJECT_NAME} test/test_components/test_components.xml)
-
-=======
->>>>>>> 0bdcd41 (Move `test_components` to own package (#1325))
   add_library(test_hardware_components SHARED
   test/test_hardware_components/test_single_joint_actuator.cpp
   test/test_hardware_components/test_force_torque_sensor.cpp
@@ -169,18 +153,6 @@ if(BUILD_TESTING)
   pluginlib_export_plugin_description_file(
     ${PROJECT_NAME} test/test_hardware_components/test_hardware_components.xml
   )
-
-<<<<<<< HEAD
-  ament_add_gmock(test_resource_manager test/test_resource_manager.cpp)
-  target_link_libraries(test_resource_manager ${PROJECT_NAME})
-  ament_target_dependencies(test_resource_manager ros2_control_test_assets)
-
-  ament_add_gmock(test_resource_manager_prepare_perform_switch test/test_resource_manager_prepare_perform_switch.cpp)
-  target_link_libraries(test_resource_manager_prepare_perform_switch hardware_interface)
-  ament_target_dependencies(test_resource_manager_prepare_perform_switch ros2_control_test_assets)
-
-=======
->>>>>>> 0bdcd41 (Move `test_components` to own package (#1325))
   ament_add_gmock(test_generic_system test/mock_components/test_generic_system.cpp)
   target_include_directories(test_generic_system PRIVATE include)
   target_link_libraries(test_generic_system ${PROJECT_NAME})