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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2b37f79a008433a5706da8aeba4d2e503cc2e1c0
Submitter: "Jaap Keuter <jaap.keuter@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

2b37f79 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    TN5250: Fix two true_false strings so they are differentiating
    
    Found by conflict check
    
    Change-Id: Ic0348945b8519bc434bc5a10b5ed5951a7cdcb21
    Reviewed-on: https://code.wireshark.org/review/37746
    Reviewed-by: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Petri-Dish: Jaap Keuter <jaap.keuter@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 620b8b3c71152c7b83799fc23896fed586fdcc04)
    Reviewed-on: https://code.wireshark.org/review/37759
    

Actions performed:

    from  ba28962   BSSAP: Fix field abbrev for IMEISV IE
     add  2b37f79   TN5250: Fix two true_false strings so they are differentiating


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