-
Committer:
l10n daemon script
-
Date:
2019-08-04 03:11:32 UTC
-
Revision ID:
git-v1:f4290d9ba94a13e3a6b99c670463170af31bf921
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"