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"

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"

Based on porting instructions by John Layt.

Summary:
Accepting an invitation in standalone kmail now only loads the whole calendar once
rather than twice.

Reviewers: dvratil, smartins

Reviewed By: dvratil

Subscribers: #kde_pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D5280

v2 used to be an encrypted message with the application/vnd.gnupg.wks
metada inside, v3 is a multipart/mixed with text/plain part first and
the encrypted vnd.gnupg.wks subpart second. The second part is not marked
as an attachment or anything, so OTP ignores it and only shows the
text/plain part instead of our customized handler for the vnd.gnupg.wks
part.

To workaround the OTP behaviour, the plugin registers itself as a handler
for multipart/mixed and checks if the multipart contains text/plain and
application/vnd.gnupg.wks sub-parts in that order. If it does it skips the
text/plain part and only decodes the second one, otherwise ot behaves like
the native multipart/mixed parser and processes the first part.

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"

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"