diff --git a/man/coap_handler.txt.in b/man/coap_handler.txt.in index 780b04d1..b0e33888 100644 --- a/man/coap_handler.txt.in +++ b/man/coap_handler.txt.in @@ -460,7 +460,6 @@ In _create_handler_, data from _request_ can be abstracted as described in *NOTE:* If the returned value is NULL, then a 4.06 packet will get sent back to the client by libcoap. ->>>>>>> 10fc1b89 (coap_resource.c: Make dynamic resource handling thread safe) EXAMPLES --------