Update CMakeLists.txt

urfeex · web-flow · commit 8cad6e7b25d7 · 2025-10-10T13:53:48.000+02:00
diff --git a/ur_robot_driver/CMakeLists.txt b/ur_robot_driver/CMakeLists.txt
@@ -129,16 +129,12 @@ target_link_libraries(trajectory_until_node PUBLIC
 )
 
 install(
-<<<<<<< HEAD
-  TARGETS dashboard_client 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}
 )
 
