Diffusion KWin 982d7cc4387a

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

Authored by l10n daemon script <scripty@kde.org> on Dec 7 2018, 4:29 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>Dec 7 2018, 4:29 AM
Parents
R108:3956d6ab4a4e: [autotests] Fix failing of testDontCrashReinitializeCompositor
Branches
Unknown
Tags
Unknown
l10n daemon script <scripty@kde.org> committed R108:982d7cc4387a: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 7 2018, 4:29 AM