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"
Description
Description
Details
Details
- Committed
l10n daemon script <scripty@kde.org> Apr 28 2016, 1:03 PM - Parents
- R108:6d60f01ad96a: Skip DontCrashEmptyDecorationTest if we don't have a /dev/dri/card0 device
- Branches
- Unknown
- Tags