-
Committer:
l10n daemon script
-
Date:
2019-06-19 03:26:28 UTC
-
Revision ID:
git-v1:92d85096cf7e1cafdac931786123bd0cd43046e5
Tags: v19.07.80, v19.08.0, v19.08.2
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"