Backport: Fix merge conflicts #635
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
requested review from
anfemosa,
bijoua29,
bmagyar,
destogl,
erickisos,
livanov93 and
malapatiravi
destogl
pushed a commit
that referenced
this pull request
May 31, 2023
* [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 * Fix merge conflicts (#635) --------- Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixing the merge conflicts for #634
Humble diverged from rolling, because #551 was not backported.