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

Authored by l10n daemon script <scripty@kde.org> on Apr 3 2019, 4:12 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 3 2019, 4:12 AM
Parents
R120:b40dabdc27e4: [color-wallpaper] Align with the master FormLayout
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R120:1cf7f1d69619: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 3 2019, 4:12 AM