Skip to content

Commit a6d3268

Browse files
urfeexmergify[bot]
authored andcommitted
Fix broken link to robot_setup in README (#1263)
The respective URCap installation setup got merged into the robot_setup in the client_library's documentation. (cherry picked from commit d7f3ea7) # Conflicts: # README.md
1 parent 4fd0b24 commit a6d3268

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,14 @@ For getting started, you'll basically need three steps:
100100
See the [installation instructions](https://docs.ros.org/en/ros2_packages/humble/api/ur_robot_driver/doc/installation/installation.html) for more details and source-build instructions.
101101

102102
2. **Start & Setup the robot**. Once you've installed the driver, [setup the
103+
<<<<<<< HEAD
103104
robot](https://docs.ros.org/en/ros2_packages/humble/api/ur_robot_driver/doc/installation/robot_setup.html)
104105
and [create a program for external
105106
control](https://docs.ros.org/en/ros2_packages/humble/api/ur_robot_driver/doc/installation/install_urcap_e_series.html).
107+
=======
108+
robot](https://docs.universal-robots.com/Universal_Robots_ROS2_Documentation/doc/ur_robot_driver/ur_robot_driver/doc/installation/robot_setup.html)
109+
to be able to communicate with this driver correctly.
110+
>>>>>>> d7f3ea7 (Fix broken link to robot_setup in README (#1263))
106111
107112
Please do this step carefully and extract the calibration as explained
108113
[here](https://docs.ros.org/en/ros2_packages/humble/api/ur_robot_driver/doc/installation/robot_setup.html#extract-calibration-information).

0 commit comments

Comments
 (0)