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

Authored by l10n daemon script <scripty@kde.org> on Oct 5 2018, 3:52 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 5 2018, 3:52 AM
Parents
R224:d7d2917e00f9: Use new icon for clearing notifications
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R224:d31475867011: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 5 2018, 3:52 AM