-
Committer:
l10n daemon script
-
Date:
2016-12-20 12:16:29 UTC
-
Revision ID:
git-v1:4be6bb232cd20a546bef811c3c1fc188b4e9aef3
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"