-
Committer:
l10n daemon script
-
Date:
2018-08-18 03:44:22 UTC
-
Revision ID:
git-v1:7f96c9b42e92810da6d5a5052ed802a152eccdbd
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"