-
Committer:
l10n daemon script
-
Date:
2018-03-25 04:29:42 UTC
-
Revision ID:
git-v1:a7e47f42d60c5ea52f3f928ec2822fa071ef9f7b
Tags: v18.07.80, v18.07.90, v18.08.0
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"