diff options
| author | l10n daemon script <[email protected]> | 2025-06-28 01:34:05 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-28 01:34:05 +0000 |
| commit | 64f38f89a63c7afe5fbd5181f9de65c4b3be48b7 (patch) | |
| tree | a17343cf3b8afb9c5612c4115a1186cce5b8e4e1 /po/fa | |
| parent | 85f218e24f2af3f65274c64e876cee807c54b5a2 (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')
0 files changed, 0 insertions, 0 deletions