Update ur_control.launch.py

Author: urfeex

ur_robot_driver/launch/ur_control.launch.py

@@ -355,17 +355,12 @@ def controller_spawner(controllers, active=True):
         controllers_active.append(initial_joint_controller.perform(context))
         controllers_inactive.remove(initial_joint_controller.perform(context))
 
-<<<<<<< HEAD
-    controller_spawners = [controller_spawner(controllers_active)] + [
-        controller_spawner(controllers_inactive, active=False)
-=======
     if use_mock_hardware.perform(context) == "true":
         controllers_active.remove("tcp_pose_broadcaster")
 
     controller_spawners = [
         controller_spawner(controllers_active),
         controller_spawner(controllers_inactive, active=False),
->>>>>>> 79252cf (Disable pose broadcaster on mock hardware (#1229))
     ]
 
     nodes_to_start = [