-
Committer:
l10n daemon script
-
Date:
2015-12-23 03:20:51 UTC
-
Revision ID:
git-v1:6d1b89190bcb928e96fc5287fccbddf788f6c6f6
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"