Skip to content

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

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

From: https://github.com/frappe/erpnext/pull/41326
Date: 2024-05-10 12:06:43+00:00


Diagnostics

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


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

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

# 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