-
Committer:
l10n daemon script
-
Date:
2019-08-03 03:02:38 UTC
-
Revision ID:
git-v1:a1d58ddf023d0a6664dd32a01eb7a9cc616a20a6
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"