-
Committer:
l10n daemon script
-
Date:
2019-07-15 03:04:37 UTC
-
Revision ID:
git-v1:7167a494201c3990b153549a165e51049d2f99fc
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"