search

ROS-Spanish-Users-Group / ros2_documentation

ROS 2 docs repository
https://ros-spanish-users-group.github.io/ros2_documentation
Creative Commons Attribution 4.0 International
14 stars 14 forks source link

Fix conflict in source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst #44

Closed fmrico closed 1 year ago

fmrico commented 1 year ago

Please resolve conflicts in next files: source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst

Complete message: Auto-merging conf.py Auto-merging source/How-To-Guides/Using-Python-Packages.rst Auto-merging source/Installation/DDS-Implementations/Working-with-eProsima-Fast-DDS.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst CONFLICT (content): Merge conflict in source/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.rst Auto-merging source/Tutorials/Beginner-Client-Libraries/Creating-A-Workspace/Creating-A-Workspace.rst Automatic merge failed; fix conflicts and then commit the result.