-
Committer:
l10n daemon script
-
Date:
2018-06-18 03:31:44 UTC
-
Revision ID:
git-v1:82525209565f48c8015ff9209fe3f2c39ee2da47
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"