From dadb6af0dbc6242cdf71e414c64368440ab80df8 Mon Sep 17 00:00:00 2001 From: Oliv4945 Date: Wed, 28 Oct 2020 14:41:47 +0100 Subject: [PATCH] Fix merge issue --- draft-ietf-lpwan-schc-over-lorawan.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/draft-ietf-lpwan-schc-over-lorawan.md b/draft-ietf-lpwan-schc-over-lorawan.md index 01be332..d388670 100644 --- a/draft-ietf-lpwan-schc-over-lorawan.md +++ b/draft-ietf-lpwan-schc-over-lorawan.md @@ -766,14 +766,8 @@ The format of this uplink is application specific. It is RECOMMENDED for a device to send an empty frame (see {{lorawan-empty-frame}}) but it is application specific and will be used by the NGW to transmit a potential SCHC ACK REQ. SCHC_ACK_REQ_DN_OPPORTUNITY is application specific and its recommended value -<<<<<<< HEAD -is 2, it MUST be greater than 1. This allows for more downlink opportunities -than required by SCHC control traffic, leaving opportunity for any other -downlink with higher priority than SCHC ACK REQ message. -======= is 2. It MUST be greater than 1. This allows to open a downlink opportunity to any downlink with higher priority than the SCHC ACK REQ message. ->>>>>>> 0b92a54cc8a5551fcf289f74e1ae3637a2f1c217 _Note_: The device MUST keep this SCHC ACK message in memory until it receives a downlink SCHC Fragmentation Message (with FPort == FPortDown) that is not a SCHC ACK REQ: it indicates that