As conflict marks were committed.

Regards,
Thomas.

Attachment: 0001-remove-conflict-marks.patch
Description: Binary data

Reply via email to