-
Committer:
l10n daemon script
-
Date:
2019-07-31 03:09:25 UTC
-
Revision ID:
git-v1:783da6d8e93737f5e41a3bc017906dc1f94bb94f
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"