Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/40635
Date: 2024-03-25 20:10:53+00:00


Diagnostics

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


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


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

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

# 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