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

Authored by l10n daemon script <scripty@kde.org> on Jul 22 2019, 6:37 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>Jul 22 2019, 6:37 AM
Parents
R320:7264c34e54f1: kio_sftp: QFile::rename takes QString, so remove erroneous QFile::encodeName
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R320:18fd46e97876: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 22 2019, 6:37 AM