Backport: Fix merge conflicts #1043
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
arne48,
bmagyar,
DasRoteSkelett,
destogl,
mcbed,
progtologist and
rosterloh
arne48
approved these changes
May 31, 2023
bmagyar
pushed a commit
that referenced
this pull request
May 31, 2023
) * Docs: Use branch name substitution for all links (#1031) (cherry picked from commit 590de4e) # Conflicts: # doc/index.rst # hardware_interface/doc/hardware_components_userdoc.rst # hardware_interface/doc/mock_components_userdoc.rst # hardware_interface/doc/writing_new_hardware_interface.rst # ros2controlcli/doc/userdoc.rst * Fix merge conflicts (#1043) --------- Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
flochre
pushed a commit
to flochre/ros2_control
that referenced
this pull request
Jul 5, 2023
…ls#1031) (ros-controls#1042) * Docs: Use branch name substitution for all links (ros-controls#1031) (cherry picked from commit 590de4e) # Conflicts: # doc/index.rst # hardware_interface/doc/hardware_components_userdoc.rst # hardware_interface/doc/mock_components_userdoc.rst # hardware_interface/doc/writing_new_hardware_interface.rst # ros2controlcli/doc/userdoc.rst * Fix merge conflicts (ros-controls#1043) --------- 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 #1042