-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:38:30 UTC
-
Revision ID:
git-v1:105896cd3f0ea314c26b7707563c455413ce6d30
Tags: v18.11.80, v19.03.90, v19.04.0, v19.04.1
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"