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 14 2015, 10:22 AM - Parents
- R2:eed0fd7af35e: combobox, remove top anchor (else for languages, you don't see the bottom of…
- Branches
- Unknown
- Tags