l10n daemon script 59df28822c 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-01-12 06:44:34 +01:00

2.9 KiB

Raw Blame History

View Raw