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

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

Commits:

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

    QUIC: fix conflict
    
    (d)tls.quic.parameter.length' exists multiple times with incompatible types: FT_UINT16 and FT_UINT64
    
    Change-Id: Id229843d1372afa371998f97c0b803b4775ad930
    Reviewed-on: https://code.wireshark.org/review/38009
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  f30ab19   Aruba(IAP): Octet 14 is model
     add  5bd304f   QUIC: fix conflict


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