-
Committer:
l10n daemon script
-
Date:
2019-10-19 03:23:17 UTC
-
Revision ID:
git-v1:09574d06704532b77e0b393eb91a85e73940993b
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"