Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JTC] Import docs from wiki.ros.org (backport #566) #634

Merged
merged 2 commits into from
May 31, 2023
Merged

[JTC] Import docs from wiki.ros.org (backport #566) #634

merged 2 commits into from
May 31, 2023

Commits on May 31, 2023

  1. [JTC] Import docs from wiki.ros.org (#566) 

    * Remove trajectory replacement doc from this PR

Co-authored-by: Dr. Denis <denis@stoglrobotics.de>
(cherry picked from commit 6851df1)

# Conflicts:
#	joint_trajectory_controller/doc/userdoc.rst
    @christophfroehlich @mergify
    christophfroehlich authored and mergify[bot] committed May 31, 2023
    Configuration menu
    Copy the full SHA
    92adbc6 View commit details
    Browse the repository at this point in the history

  2. Fix merge conflicts (#635)

    @christophfroehlich
    christophfroehlich committed May 31, 2023
    Configuration menu
    Copy the full SHA
    b14d3f0 View commit details
    Browse the repository at this point in the history