-
Committer:
l10n daemon script
-
Date:
2016-03-21 03:52:29 UTC
-
Revision ID:
git-v1:c9e3a760084f76af0f5e28c5aa60a9d5678ca122
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"