SVN_SILENT made messages (.desktop file) - always resolve ours

Authored by l10n daemon script <scripty@kde.org> on Oct 15 2017, 4:30 AM.

Description

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"

Details

Committed
l10n daemon script <scripty@kde.org>Oct 15 2017, 4:30 AM
Parents
R119:df6658eee5c6: Fix QFile::copy warning when the colors file doesn't exist
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:3d58beac858f: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 15 2017, 4:30 AM