-
Committer:
l10n daemon script
-
Date:
2019-01-05 04:37:53 UTC
-
Revision ID:
git-v1:e3b9498989a419d7d4fdbe6b37efcd64b2783334
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"