-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:37:29 UTC
-
Revision ID:
git-v1:3ba8ea41f83d0475c6167433e901b8c51a15b960
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"