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> Sep 19 2015, 11:57 AM - Parents
- R31:49c84c88e898: Removed 16px IM status icons, revised IM action icons and used them for…
- Branches
- Unknown
- Tags