diff options
| author | l10n daemon script <[email protected]> | 2025-09-16 01:35:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-16 01:35:02 +0000 |
| commit | ccce1c123fad5d668e44a705f629eccfdbea2048 (patch) | |
| tree | 9a1d108a0056474f3e03eb2e5d056c5c81c8574e /po/fa/dolphin.po | |
| parent | df57589d12d755a05185296a2e73d84bcbe34a26 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'po/fa/dolphin.po')
0 files changed, 0 insertions, 0 deletions