-
Committer:
l10n daemon script
-
Date:
2019-09-13 03:10:42 UTC
-
Revision ID:
git-v1:ac17f95e7c40f808af5f302edc1781161fc669aa
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"