Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2025

Update version numbers for the new release.


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

@mergify mergify bot added the conflicts label Aug 29, 2025
Copy link
Contributor Author

mergify bot commented Aug 29, 2025

Cherry-pick of 48c410a has failed:

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

You are currently cherry-picking commit 48c410a5.
  (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:   SECURITY.md
	modified:   doc/ChangeLog

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

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

@kevinbackhouse kevinbackhouse merged commit 0a09ff1 into main Aug 31, 2025
139 of 147 checks passed
@mergify mergify bot deleted the mergify/bp/main/pr-3366 branch August 31, 2025 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant