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

2021-02-15 07:09:27 +01:00

3.8 KiB

Raw Blame History

View Raw