l10n daemon script a794420d3e 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"

2024-08-09 01:21:45 +00:00

4.5 KiB

Raw Blame History

View Raw