-
Committer:
l10n daemon script
-
Date:
2018-11-22 04:59:50 UTC
-
Revision ID:
git-v1:9eaedb0513fe0c00992ab540c687e9b7a1044133
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"