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

Authored by l10n daemon script <scripty@kde.org> on Oct 16 2017, 4: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>Oct 16 2017, 4:37 AM
Parents
R120:dc64944553b8: Fix "postEvent: null receiver" warning due to nullptr->deleteLater()
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:02006ae286f5: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 16 2017, 4:37 AM