-
Committer:
l10n daemon script
-
Date:
2019-02-13 04:55:39 UTC
-
Revision ID:
git-v1:41836014c28de4ff4b01e0c5d738d66591535507
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"