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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=02155b91cc54fdee8a66e7ad168da36581859f98
Submitter: "Michael Mann <mmann78@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

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

    ipdr: fix conflict
    
    'ipdr.cm_ipv6_addr' exists multiple times with NOT compatible types: FT_IPv6 and FT_STRING
    'ipdr.cm_ipv6_addr' exists multiple times with NOT compatible types: FT_STRING and FT_IPv6
    
    Change-Id: I5e22b8ed1a9baa7b563d3170be930abdc609d0f0
    Reviewed-on: https://code.wireshark.org/review/33505
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  3ee8595   NAS 5GS: Payload container type added in Registration Request
     add  02155b9   ipdr: fix conflict


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