-
Committer:
l10n daemon script
-
Date:
2017-10-30 01:00:26 UTC
-
Revision ID:
git-v1:00608d81aa227a5507eb2964987efe540e17d4be
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"