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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fe2d407304d184ed03fb253662b23cccbc7cb12a
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32
    
    Change-Id: Ie6c6f71e413463f93924c1a47b908a1c97d94407
    Reviewed-on: https://code.wireshark.org/review/14209
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 72fb00f9c2d1ef096cb7ab9f9201c7daa1a4ba71)
    Reviewed-on: https://code.wireshark.org/review/14214
    

Actions performed:

    from  48e6087   Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
    adds  fe2d407   SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32


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