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.

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

Fix multi-line strings in DeclareLaunchArgument (backport #948) #968

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 15, 2024

@mergify mergify bot added conflicts humble Relevant for humble and higher ROS versions labels Apr 15, 2024
Copy link
Author

mergify bot commented Apr 15, 2024

Cherry-pick of d16eaba has failed:

On branch mergify/bp/humble/pr-948
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit d16eaba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ur_moveit_config/launch/ur_moveit.launch.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ur_robot_driver/launch/ur10.launch.py
	both modified:   ur_robot_driver/launch/ur10e.launch.py
	both modified:   ur_robot_driver/launch/ur16e.launch.py
	both modified:   ur_robot_driver/launch/ur20.launch.py
	both modified:   ur_robot_driver/launch/ur3.launch.py
	both modified:   ur_robot_driver/launch/ur30.launch.py
	both modified:   ur_robot_driver/launch/ur3e.launch.py
	both modified:   ur_robot_driver/launch/ur5.launch.py
	both modified:   ur_robot_driver/launch/ur5e.launch.py
	both modified:   ur_robot_driver/launch/ur_control.launch.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

* (driver) fix multi-line strings in DeclareLaunchArgument
* (moveit) fix multi-line strings in DeclareLaunchArgument

(cherry picked from commit d16eaba)
@fmauch fmauch merged commit c2860e5 into humble Apr 15, 2024
6 checks passed
@fmauch fmauch deleted the mergify/bp/humble/pr-948 branch April 15, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
humble Relevant for humble and higher ROS versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants