diff options
| author | l10n daemon script <[email protected]> | 2026-03-01 01:45:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-01 01:45:03 +0000 |
| commit | d342f3528f1161fe349fc74e80bf7fc8e2cacf55 (patch) | |
| tree | 5898044b5072b9de7be58e45b01c24537f4615d9 /COPYING.DOC | |
| parent | f26b2c959405dd8f9c4c5ff505315d9c3c92762f (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 'COPYING.DOC')
0 files changed, 0 insertions, 0 deletions