Closed mergify[bot] closed 4 weeks ago
Cherry-pick of 481e732def7dcb2941fcf92705174257dc4ba4f1 has failed:
On branch mergify/bp/iron/pr-279
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit 481e732.
(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:
new file: doc/Doxyfile
renamed: doc/api/api.rst -> doc/api_list/api_list.rst
new file: doc/api_list/mainpage.md
new file: images/logo_ros-controls_small.png
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: index.rst
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
Needed for #278 on all branches for multiversion.
This is an automatic backport of pull request #279 done by Mergify.