-
Committer:
l10n daemon script
-
Date:
2018-03-13 04:18:35 UTC
-
Revision ID:
git-v1:b00081043a1f40f71f62925bb3e221e6fea93868
Tags: v18.03.80, v18.03.90
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"