-
Committer:
l10n daemon script
-
Date:
2019-08-23 02:53:25 UTC
-
Revision ID:
git-v1:8a51a1128e74f373b5738f814776bb168fce3ddd
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"