-
Committer:
l10n daemon script
-
Date:
2019-03-17 04:41:31 UTC
-
Revision ID:
git-v1:9e8012b07153e21628d0954d0c6426790104b0f0
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"