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