-
Committer:
l10n daemon script
-
Date:
2020-06-17 11:57:34 UTC
-
Revision ID:
git-v1:96af8b4ef4cf31ac2b6bc3aac9e1086e5462cf43
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"