-
Committer:
l10n daemon script
-
Date:
2019-04-28 03:44:15 UTC
-
Revision ID:
git-v1:3e84ad6a5f32a0da19951a3806935e88a50d4a37
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"