diff options
| author | l10n daemon script <[email protected]> | 2025-10-20 01:36:16 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-20 01:36:16 +0000 |
| commit | fcc9b11db63b715b1e27475545a4b92b763c9ed0 (patch) | |
| tree | d7c15c248004b1290b47a2b365a8ab556d6ba00a /src/tests | |
| parent | 738c2b68b796423727282696222c3daee1b00b6f (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