-
Committer:
l10n daemon script
-
Date:
2018-03-25 04:29:39 UTC
-
Revision ID:
git-v1:8096bc7438ee9f972fe60a3e018a296f094c9579
Tags: v18.07.80, v18.07.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"