-
Committer:
l10n daemon script
-
Date:
2017-10-27 02:47:32 UTC
-
Revision ID:
git-v1:fd77d49751e83a2db2b5c3a97c14248796c12711
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"