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

Authored by l10n daemon script <scripty@kde.org> on Apr 19 2018, 3:22 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 19 2018, 3:22 AM
Parents
R119:9389e0fef7fb: Revert "Port Language KCM to Qt Quick"
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:d0108e2a63d0: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 19 2018, 3:22 AM