-
Committer:
l10n daemon script
-
Date:
2015-08-16 04:03:02 UTC
-
Revision ID:
git-v1:fc798810ec3ebdc0de53c1a3343dd6a1f070a30c
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"