[go: up one dir, main page]

Skip to content

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

From: https://github.com/frappe/frappe/pull/32836
Date: 2025-06-10 22:49:19+05:30

  • chore: update POT file (#32836)



Diagnostics

Conflicts detected for source commit: fe3e161bbb397532422c576d7724ff0004e6c3c7
- DU frappe/locale/main.pot
- ?? "frappe/locale/main.pot~fe3e161bbb (chore: update POT file (#32836))"


Suspicious changes found (Telemetry / telemetry):
* cb66a17ee84bd26598423ea3b39a8e2a96abda3f chore: update POT file (#32836)
```diff

```



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

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

# 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

Loading