-
Committer:
l10n daemon script
-
Date:
2017-10-14 03:30:39 UTC
-
Revision ID:
git-v1:4d3dc35520a5e876c0c8cba66a2c7c74f83e211f
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"