-
Committer:
l10n daemon script
-
Date:
2019-02-16 04:45:57 UTC
-
Revision ID:
git-v1:78cfce985e7d0f08f5d98bc7f56d9c87d987f68b
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"