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

Authored by l10n daemon script <scripty@kde.org> on Mar 22 2019, 7:30 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>Mar 22 2019, 7:30 AM
Parents
R824:909a8776aa23: GIT_SILENT Upgrade KDE Applications version to 19.03.80.
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R824:35b0454ba01e: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 22 2019, 7:30 AM