diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-08 08:56:44 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-08 16:57:20 +0000 |
| commit | ddc8a49d184bfeae232ee2b3984ac83408018eaf (patch) | |
| tree | 0f1cb13de21b93a5395f5ac254e923323f53cc27 /epan/dissectors/packet-rtse.c | |
| parent | 0f2a0e83fbb701a0836da36c16c162817d4a9b2f (diff) | |
Regenerate RTSE dissector.
Change-Id: I1662b2b28ff993ec5e4fa8faabe60f76014f7b46
Reviewed-on: https://code.wireshark.org/review/13827
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 48a11ec4f5..b890528c11 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -1010,11 +1010,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -<<<<<<< HEAD -#line 370 "../../asn1/rtse/packet-rtse-template.c" -======= -#line 365 "../../asn1/rtse/packet-rtse-template.c" ->>>>>>> Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface." +#line 366 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1036,11 +1032,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -<<<<<<< HEAD -#line 379 "../../asn1/rtse/packet-rtse-template.c" -======= -#line 374 "../../asn1/rtse/packet-rtse-template.c" ->>>>>>> Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface." +#line 375 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { |