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

2020-12-26 09:29:49 +01:00

2.4 KiB

Raw Blame History

View Raw