-
Committer:
l10n daemon script
-
Date:
2016-12-13 03:09:15 UTC
-
Revision ID:
git-v1:08e5b19e1b8ac314d935eacc727e9908024fb003
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"