-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:21:51 UTC
-
Revision ID:
git-v1:ee3bdcadc2cb0e8197f4afbfb83403f54b183136
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"