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

Authored by l10n daemon script <scripty@kde.org> on May 11 2019, 3:58 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 11 2019, 3:58 AM
Parents
R480:60c8a15e726f: cmake: Remove unused MacroUtils.cmake module
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R480:8de8bac8729c: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 11 2019, 3:58 AM