diff options
| author | l10n daemon script <[email protected]> | 2026-02-05 01:41:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-05 01:41:49 +0000 |
| commit | 84476434514a201f2354c53489f1fd677b099404 (patch) | |
| tree | e1515f0b36bc0566bd92ec3a00c0a39c313fb975 /README.md | |
| parent | 5eafa19e2eca2ea6f6498011b263ca38f9f91e91 (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 'README.md')
0 files changed, 0 insertions, 0 deletions