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

Authored by l10n daemon script <scripty@kde.org> on Dec 15 2018, 7:24 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>Dec 15 2018, 7:24 AM
Parents
R119:36e724f1f458: Make accessibility warning dialog usable again and fix event handling
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R119:7fbcd9696d41: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 15 2018, 7:24 AM