-
Committer:
l10n daemon script
-
Date:
2018-04-28 03:27:35 UTC
-
Revision ID:
git-v1:fd45c28915a727ea88006299eea14895ca960b75
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"