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: german translations (backport #42798) #42799

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2024


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

(cherry picked from commit 751c209)

# Conflicts:
#	erpnext/translations/de.csv
Copy link
Contributor Author

mergify bot commented Aug 16, 2024

Cherry-pick of 751c209 has failed:

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

You are currently cherry-picking commit 751c20984f.
  (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:   erpnext/translations/de.csv

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

@barredterra barredterra deleted the mergify/bp/version-14-hotfix/pr-42798 branch August 16, 2024 17:59
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant