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

Authored by l10n daemon script <scripty@kde.org> on Jan 19 2019, 7:33 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>Jan 19 2019, 7:33 AM
Parents
R120:7e6d0c0b0eeb: [wallpapers/image] Port wallpaper plugins (mostly) to QQC2
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:70b3b880b9a6: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 19 2019, 7:33 AM