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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7e12cb1537ff4a95b0b8487e36dd2b8d727577d8
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

7e12cb1 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    mqtt: fix conflict
    
    'mqtt.willmsg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
    'mqtt.msg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
    
    Change-Id: Iaace2464c3e7174bbd6adc7550fe51e614b4d0bb
    Reviewed-on: https://code.wireshark.org/review/34750
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  5dd3c2b   Wi-Fi NAN: Fix defererence NULL in 802.11 channel set lookup
     add  7e12cb1   mqtt: fix conflict


Summary of changes:
 epan/dissectors/packet-mqtt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)