-
Committer:
l10n daemon script
-
Date:
2018-12-29 11:21:14 UTC
-
Revision ID:
git-v1:ff206e0867834a2df703c5b2ce57efd9fdf85b90
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"