-
Committer:
l10n daemon script
-
Date:
2018-11-06 04:59:34 UTC
-
Revision ID:
git-v1:a1098ab8224922b8ee0f009f56da55020421cacf
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"