diff options
| author | l10n daemon script <[email protected]> | 2024-09-27 01:25:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-09-27 01:25:00 +0000 |
| commit | 5242d0ce3866b96a100e620b6f52277cd48e8730 (patch) | |
| tree | 262be6dee3ad1460b83f72f8af1d06b44e0efbb0 /po | |
| parent | 36dc660a4699df0179b8fa5cb7473e95df0545d1 (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')
0 files changed, 0 insertions, 0 deletions