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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7e13a3dda2e1fa3fc1c70ed43189b9eda5874ac6
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

7e13a3d by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    Nano: Fix field abbrev
    
    Found by conflict check
    
    Change-Id: Ifdb0a2e5debab8ce8ed13127ea986d15a45e700b
    Reviewed-on: https://code.wireshark.org/review/37792
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
    (cherry picked from commit 158c414fe4740fc6decd42ac44e329e225d690f9)
    Reviewed-on: https://code.wireshark.org/review/37803
    (cherry picked from commit 4cc0384ac4c6665e3d744ab88383ead8afc55669)
    Reviewed-on: https://code.wireshark.org/review/37804
    

Actions performed:

    from  4674c00   tn3270: improve on some of IBM's painful prose.
     add  7e13a3d   Nano: Fix field abbrev


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