Skip to content

[19461] Fix Fast CDR API reference PDF generation (backport #161)#163

Merged
JLBuenoLopez merged 2 commits into1.0.xfrom
mergify/bp/1.0.x/pr-161
Sep 11, 2023
Merged

[19461] Fix Fast CDR API reference PDF generation (backport #161)#163
JLBuenoLopez merged 2 commits into1.0.xfrom
mergify/bp/1.0.x/pr-161

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Sep 8, 2023

This is an automatic backport of pull request #161 done by Mergify.
Cherry-pick of 8c78438 has failed:

On branch mergify/bp/1.0.x/pr-161
Your branch is up to date with 'origin/1.0.x'.

You are currently cherry-picking commit 8c78438.
  (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:   doxyfile.in

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CMakeLists.txt

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
(cherry picked from commit 8c78438)

# Conflicts:
#	CMakeLists.txt
@richiprosima
Copy link
Copy Markdown
Contributor

Build status:

  • Linux Build Status
  • Mac Build Status
  • Windows Build Status

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
@richiprosima
Copy link
Copy Markdown
Contributor

Build status:

  • Linux Build Status
  • Mac Build Status
  • Windows Build Status

@JLBuenoLopez JLBuenoLopez merged commit b68e8a6 into 1.0.x Sep 11, 2023
@JLBuenoLopez JLBuenoLopez deleted the mergify/bp/1.0.x/pr-161 branch September 11, 2023 10:09
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