Resolve merge conflicts

urfeex · urfeex · commit b84d30e3bc44 · 2025-10-13T12:24:00.000Z
diff --git a/ur_robot_driver/CMakeLists.txt b/ur_robot_driver/CMakeLists.txt
@@ -140,16 +140,12 @@ target_link_libraries(trajectory_until_node PUBLIC
 )
 
 install(
-<<<<<<< HEAD
-  TARGETS dashboard_client ur_ros2_control_node controller_stopper_node urscript_interface robot_state_helper
-=======
   TARGETS
     dashboard_client
     controller_stopper_node
     urscript_interface
     robot_state_helper
     trajectory_until_node
->>>>>>> 92ded2d (Trajectory until node (#1461))
   DESTINATION lib/${PROJECT_NAME}
 )
 
diff --git a/ur_robot_driver/doc/index.rst b/ur_robot_driver/doc/index.rst
@@ -18,13 +18,4 @@ Welcome to ur_robot_driver's documentation!
    generated/index
    robot_state_helper
    controller_stopper
-<<<<<<< HEAD
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-=======
    trajectory_until_node
->>>>>>> 92ded2d (Trajectory until node (#1461))
