Wireshark-commits: [Wireshark-commits] master 79fc1f1: iso14443: fix conflict/typo

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 02 Oct 2019 20:28:05 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=79fc1f164d3cf4c7ad200c1dc79d002142b4e847
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

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

    iso14443: fix conflict/typo
    
    'iso14443.write_block.number' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT16
    
    Change-Id: I1e92e470acf1bda89b894dd8603309f7168bb069
    Reviewed-on: https://code.wireshark.org/review/34681
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  d4c5dc2   homeplug_av: fix conflict/typo
     add  79fc1f1   iso14443: fix conflict/typo


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