diff options
| author | l10n daemon script <[email protected]> | 2025-11-12 01:38:58 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-11-12 01:38:58 +0000 |
| commit | b7701d6341b5c562ae46b32ca7bfed51d9ddecf9 (patch) | |
| tree | 8eb91fbb0e493fa2541dcc4b77244ee17defbff2 /src/tests | |
| parent | a92890d595f178953c18ad3c8d07b577e822523f (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