Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: avoid double translation (backport #22578) #22580

Merged
merged 2 commits into from
Sep 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2023

This is an automatic backport of pull request #22578 done by Mergify.
Cherry-pick of c561369 has failed:

On branch mergify/bp/version-13-hotfix/pr-22578
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit c561369330.
  (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:   frappe/permissions.py

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/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

(cherry picked from commit c561369)

# Conflicts:
#	frappe/permissions.py
@mergify mergify bot requested review from a team and maharshivpatel and removed request for a team September 29, 2023 06:54
@mergify mergify bot added the conflicts label Sep 29, 2023
@sagarvora sagarvora merged commit 2c267ea into version-13-hotfix Sep 29, 2023
9 checks passed
@sagarvora sagarvora deleted the mergify/bp/version-13-hotfix/pr-22578 branch September 29, 2023 06:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 14, 2023
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.58.13 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants