-
Committer:
l10n daemon script
-
Date:
2016-03-07 10:38:06 UTC
-
Revision ID:
git-v1:6b685cab5fd160cb9d5475f933b0e5ae16f7b8c1
Tags: v16.03.80, v16.03.90, v16.04.1, v16.04.2, v16.04.3
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"