-
Committer:
l10n daemon script
-
Date:
2016-12-12 02:59:07 UTC
-
Revision ID:
git-v1:70d3b9b3661eb5377abc36102fa8128141ec1f65
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"