diff options
| author | l10n daemon script <[email protected]> | 2026-04-09 01:50:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-04-09 01:50:12 +0000 |
| commit | b6e66e90d71a49a2ad2040a79fecd670425d375f (patch) | |
| tree | e81ea0ce477620a94569ff2abf3bf461e0981d0c /src/tests | |
| parent | 59bec18c27328c865bbbcb62e38b410fdbefb348 (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 'src/tests')
0 files changed, 0 insertions, 0 deletions