search

tlswg / dtls13-spec

Repo for DTLS 1.3
32 stars 25 forks source link

It seems there a merge conflict. #243

Closed taoso closed 3 years ago

taoso commented 3 years ago

It seems there a merge conflict.

##  Transport Layer Mapping {#transport-layer-mapping}

DTLS messages MAY be fragmented into multiple DTLS records.
Each DTLS record MUST fit within a single datagram.  In order to
avoid IP fragmentation, clients of the DTLS record layer SHOULD
<<<<<<< HEAD
attempt to size records so that they fit within any PMTU estimates
obtained from the record layer. For more information about PMTU issues
see {{pmtu-issues}}.
=======
attempt to size records so that they fit within any Path MTU (PMTU) estimates
obtained from the record layer.
>>>>>>> hannestschofenig-patch-40
ekr commented 3 years ago

Yeah, I have fixed it in my copy.

ekr commented 3 years ago

and now in the repo