Resolve merge conflicts

Author: urfeex

ur_robot_driver/CMakeLists.txt

@@ -123,11 +123,7 @@ add_executable(urscript_interface
 ament_target_dependencies(urscript_interface ${${PROJECT_NAME}_EXPORTED_TARGETS} ${THIS_PACKAGE_INCLUDE_DEPENDS})
 
 install(
-<<<<<<< HEAD
-  TARGETS dashboard_client ur_ros2_control_node controller_stopper_node urscript_interface
-=======
-  TARGETS dashboard_client controller_stopper_node urscript_interface robot_state_helper
->>>>>>> d4947aa (Port robot_state_helper to ROS2 (#933))
+  TARGETS dashboard_client ur_ros2_control_node controller_stopper_node urscript_interface robot_state_helper
   DESTINATION lib/${PROJECT_NAME}
 )
 

ur_robot_driver/doc/index.rst

@@ -14,19 +14,13 @@ Welcome to ur_robot_driver's documentation!
    installation/toc
    usage
    setup_tool_communication
-<<<<<<< HEAD
    ROS_INTERFACE
    generated/index
-
+   robot_state_helper
+   controller_stopper
 
 
 Indices and tables
 ==================
 
 * :ref:`genindex`
-=======
-   hardware_interface_parameters
-   dashboard_client
-   robot_state_helper
-   controller_stopper
->>>>>>> d4947aa (Port robot_state_helper to ROS2 (#933))