l10n daemon script 52e5ec50c6 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-20 12:01:33 +01:00

2.7 KiB

Raw Blame History

View Raw