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

Authored by l10n daemon script <scripty@kde.org> on Jan 8 2017, 6:59 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 8 2017, 6:59 AM
Parents
R44:f32aaa9d574f: IMAP: Fix crash when session is destroyed during password request
Branches
Unknown
Tags
Unknown
References
tag: v16.12.1
l10n daemon script <scripty@kde.org> committed R44:627131d3c43d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 8 2017, 6:59 AM