-
Committer:
l10n daemon script
-
Date:
2015-08-22 11:00:16 UTC
-
Revision ID:
git-v1:3e81ae98b9716a76dd1fc0e11e494bcaba186e9e
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"