-
Committer:
l10n daemon script
-
Date:
2018-04-01 03:32:38 UTC
-
Revision ID:
git-v1:4bc146baeb1bd9ff8d23cc8be9e6aaa9840d7cd2
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"