-
Committer:
l10n daemon script
-
Date:
2019-02-22 04:35:21 UTC
-
Revision ID:
git-v1:37610f4a7fc22aced154d510a4d4a8c363a20a30
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"