-
Committer:
l10n daemon script
-
Date:
2019-04-28 03:43:00 UTC
-
Revision ID:
git-v1:f5ddafed5f8718d8149e4f8470d01180c61044e7
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"