-
Committer:
l10n daemon script
-
Date:
2018-12-29 11:21:00 UTC
-
Revision ID:
git-v1:293c1586b24a5842559aec420ad8eebc19be8ed6
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"