-
Committer:
l10n daemon script
-
Date:
2019-01-15 01:06:42 UTC
-
Revision ID:
git-v1:2140769db585e776b2e490e38721261a6c81df24
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"