-
Committer:
l10n daemon script
-
Date:
2017-10-14 03:28:08 UTC
-
Revision ID:
git-v1:8945d5d116dd61890535702342864ac788d7e8ab
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"