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> Jun 22 2016, 4:32 PM - Parents
- R37:634b1a8421f2: Fix unbalanced barrierLock() in KisCanvas2::slotSetDisplayProfile
- Branches
- Unknown
- Tags