l10n daemon script b9bd2aabff 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-10-26 06:08:59 +01:00

834 B

Raw Blame History

View Raw