diff options
| author | l10n daemon script <[email protected]> | 2024-11-11 01:26:29 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-11-11 01:26:29 +0000 |
| commit | d68a59865ed764bdd9743f4603a4be40c920e433 (patch) | |
| tree | f935ea850f1de50c51b51ea9406374e240dbddf2 /src/tests | |
| parent | bc3973a6c448487efbba41b0b3b6bbd260cb7e42 (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