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

Authored by l10n daemon script <scripty@kde.org> on Oct 22 2019, 3:19 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>Oct 22 2019, 3:19 AM
Parents
R119:78ccc2eba9cb: [KCMs/Night Color] Add a valueForText handler for the new SpinBox
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:8f81c6e812f5: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 22 2019, 3:19 AM