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

Authored by l10n daemon script <scripty@kde.org> on Jan 6 2019, 4:43 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>Jan 6 2019, 4:43 AM
Parents
R120:f47178cb4a7b: Revert "Add ellipsis(...) at the end of text field"
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:d20799548a08: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 6 2019, 4:43 AM