-
Committer:
l10n daemon script
-
Date:
2018-01-16 03:53:52 UTC
-
Revision ID:
git-v1:bc9000bb72683afc4bb0f2bb4574e1a0a9fc85c7
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"