-
Committer:
l10n daemon script
-
Date:
2020-04-06 04:08:22 UTC
-
Revision ID:
git-v1:ae14c25194bac86efa85691efbe668b9c884fb19
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"