Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Dec 8, 2025


This is an automatic backport of pull request #1456 done by [Mergify](https://mergify.com).

(cherry picked from commit d9a8f32)

# Conflicts:
#	crm/locale/main.pot
@mergify
Copy link
Author

mergify bot commented Dec 8, 2025

Cherry-pick of d9a8f32 has failed:

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

You are currently cherry-picking commit d9a8f327.
  (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:   crm/locale/main.pot

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

@pratikb64 pratikb64 merged commit 6c488fb into main-hotfix Dec 10, 2025
2 checks passed
@pratikb64 pratikb64 deleted the mergify/bp/main-hotfix/pr-1456 branch December 10, 2025 07:04
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.

4 participants