-
Committer:
l10n daemon script
-
Date:
2018-04-03 03:28:18 UTC
-
Revision ID:
git-v1:ee39f1d596cb15b29758a6f4ac81ee00051e1c16
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"