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

Authored by l10n daemon script <scripty@kde.org> on Jul 23 2018, 3: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>Jul 23 2018, 3:24 AM
Parents
R114:b5551c17f4e4: Cleaned code for binary clock applet and added comments
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R114:1c47829d044d: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 23 2018, 3:24 AM