-
Committer:
l10n daemon script
-
Date:
2015-12-24 03:15:39 UTC
-
Revision ID:
git-v1:cec58186a606ce3c759ecd6d96546711ebc3a90f
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"