-
Committer:
l10n daemon script
-
Date:
2018-02-08 04:11:10 UTC
-
Revision ID:
git-v1:de9c1be226d44145f8b5918cf0996780c94b29d9
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"