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

Authored by l10n daemon script <scripty@kde.org> on May 22 2019, 3:21 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>May 22 2019, 3:21 AM
Parents
R381:d6b427fc5660: Use CamelCase includes for KF headers
Branches
Unknown
Tags
Unknown
References
tag: v19.08.3, tag: v19.08.2, tag: v19.08.1, tag: v19.08.0, tag: v19.07.90, tag: v19.07.80, Applications/19.08
l10n daemon script <scripty@kde.org> committed R381:1f4dad79eec8: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 22 2019, 3:21 AM