-
Committer:
l10n daemon script
-
Date:
2017-11-04 01:01:50 UTC
-
Revision ID:
git-v1:36f4d67eb5724767198dc92f0a2826cb4f8cad43
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"