-
Committer:
l10n daemon script
-
Date:
2018-02-08 04:11:29 UTC
-
Revision ID:
git-v1:e13fa8aff68061e7f55242b43e9a9466237945b3
Tags: v18.03.80, v18.03.90, v18.04.1, v18.04.3, 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"