-
Committer:
l10n daemon script
-
Date:
2019-08-03 03:02:33 UTC
-
Revision ID:
git-v1:378ada57627171d4d59cb399a5c182519e37b690
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"