Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2025

Needs release 0.4.0
for reference, see PickNikRobotics/generate_parameter_library#213


This is an automatic backport of pull request #1994 done by Mergify.

(cherry picked from commit f8c03cc)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
@mergify mergify bot added the conflicts label Jan 15, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jan 15, 2025

Cherry-pick of f8c03cc has failed:

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

You are currently cherry-picking commit f8c03cc.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/controller_manager.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

@christophfroehlich
Copy link
Contributor

not needed, we don't use GPL on humble

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1994 branch January 15, 2025 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants