-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:37:02 UTC
-
Revision ID:
git-v1:4fbb85dfb15d459dd5fe183517ff552e919209b2
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"