Diffusion Ark d93eae1463ea

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

Authored by l10n daemon script <scripty@kde.org> on Feb 11 2019, 4:34 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>Feb 11 2019, 4:34 AM
Parents
R36:ca4667adf1cd: Determine isDirectory by "Folder = " field in 7z plugin
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R36:d93eae1463ea: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Feb 11 2019, 4:34 AM