Diffusion Rocs 4e43ec96f3e4

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

Authored by l10n daemon script <scripty@kde.org> on Apr 19 2016, 10:54 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 19 2016, 10:54 AM
Parents
R73:32bd038d7f60: Merge branch 'Applications/16.04'
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R73:4e43ec96f3e4: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 19 2016, 10:54 AM