-
Committer:
l10n daemon script
-
Date:
2015-08-11 13:19:31 UTC
-
Revision ID:
git-v1:e6efe4940bf5c2d0695c6dee67ea2cc107aebf17
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"