GitLab

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"

The maximum size supported by QWebEngineView::setContent() is 2 MB, not 2 GB.

BUG: 387061
FIXED-IN: 5.15.0

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"

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"

Bug reported by Luca Beltrame

For the moment it's a workaround until we fix it in kmime