-
Committer:
l10n daemon script
-
Date:
2018-08-18 03:44:51 UTC
-
Revision ID:
git-v1:26580248c9aa39593ab97df7a178b52b9c69fc7d
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"