-
Committer:
l10n daemon script
-
Date:
2019-01-26 04:37:06 UTC
-
Revision ID:
git-v1:32264fe6ffb340addf9b6c88e0f99d76f8261e9b
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"