-
Committer:
l10n daemon script
-
Date:
2018-09-03 03:49:24 UTC
-
Revision ID:
git-v1:40bca4c94018c8fd44a616f2f9642b5b313dcb53
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"