-
Committer:
l10n daemon script
-
Date:
2018-02-08 04:11:20 UTC
-
Revision ID:
git-v1:37e27a69ebcfa6565b725c09a04345c061e01949
Tags: v18.03.80
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"