Skip to content

chore: update POT file by frappe-pr-bot [frappe] PR#41540

Bot Dokos requested to merge ft-pr-41540 into develop

From: https://github.com/frappe/erpnext/pull/41540
Date: 2024-05-18 06:13:11+00:00


Diagnostics

Conflicts detected for source commit: b071e952dda9ac96bb0f5420059ad6d722a9d065
- DU erpnext/locale/main.pot
Cleaning files from denylist:
 erpnext/locale/main.pot | 84198 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84198 insertions(+)


Conflicts detected for source commit: f7eb9d44a8395957711f3ed692e70d05cd10caad
- DU erpnext/locale/main.pot
Cleaning files from denylist:
 erpnext/locale/main.pot | 84198 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84198 insertions(+)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-41540

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-41540

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports