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

Authored by l10n daemon script <scripty@kde.org> on Jul 31 2019, 6:57 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>Jul 31 2019, 6:57 AM
Parents
R878:43d1985d4e5a: improve LeftClick::PreviewWindows
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R878:e438e0451139: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 31 2019, 6:57 AM