Regenerate RTSE dissector.
authorGuy Harris <guy@alum.mit.edu>
Mon, 8 Feb 2016 16:56:44 +0000 (08:56 -0800)
committerGuy Harris <guy@alum.mit.edu>
Mon, 8 Feb 2016 16:57:20 +0000 (16:57 +0000)
Change-Id: I1662b2b28ff993ec5e4fa8faabe60f76014f7b46
Reviewed-on: https://code.wireshark.org/review/13827
Reviewed-by: Guy Harris <guy@alum.mit.edu>
epan/dissectors/packet-rtse.c

index 48a11ec4f5e44263c154384f5a59b61b83d8a1b4..b890528c1156bb457ec6eb2558acb51924f48b8b 100644 (file)
@@ -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[] = {