-
Committer:
l10n daemon script
-
Date:
2015-12-27 03:20:38 UTC
-
Revision ID:
git-v1:df5f93801b86c565335381f56fd133cd073c9282
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"