[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=461d9be5bf46241cfa4b47b466f230335dc5a656
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

461d9be by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    coap/oscore: fix conflict
    
    'oscore.opt.object_security_kid' exists multiple times with NOT compatible types: FT_BYTES and FT_BOOLEAN
    
    Change-Id: Iba511c0804a8904a33deefecf75231ccdde938d2
    Reviewed-on: https://code.wireshark.org/review/28840
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  0c0dadb   CMake: More update_tools_help fixes.
    adds  461d9be   coap/oscore: fix conflict


Summary of changes:
 epan/dissectors/packet-coap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)