diff options
| author | l10n daemon script <[email protected]> | 2025-06-13 01:33:37 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-13 01:33:37 +0000 |
| commit | c5a563089f801b9612413e2cca63d0fa138855cd (patch) | |
| tree | fddd68155159164ed3ca493154fd1448c20e27e3 /po | |
| parent | 8e3addb7e73122a4c89ef347b03f714ff75a253a (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