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

Authored by l10n daemon script <scripty@kde.org> on Apr 14 2019, 3:47 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>Apr 14 2019, 3:47 AM
Parents
R878:1145a4542014: plasma indicator increase hovered image opacity
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R878:210674d67bfc: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 14 2019, 3:47 AM