-
Committer:
l10n daemon script
-
Date:
2017-10-14 00:33:41 UTC
-
Revision ID:
git-v1:3f01ae027c49c4f04926d80c7af7271cb6424fb8
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"