Skip to content

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

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

From: https://github.com/frappe/frappe/pull/25948
Date: 2024-04-15 11:38:18+00:00


Diagnostics

Conflicts detected for source commit: a6b040123856480daaacd53c41e10c915bd3a809
- DU frappe/locale/main.pot


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

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

# 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