-
Committer:
l10n daemon script
-
Date:
2019-02-15 04:41:35 UTC
-
Revision ID:
git-v1:a3591c01635d9dafd4043ba54dafa17550fc47f6
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"