PERFORCE change 141312 for review

[Andre Oppermann]

http://perforce.freebsd.org/chv.cgi?CH=141312

Change 141312 by andre at andre_flirtbox on 2008/05/07 22:40:37

	Fix botched integration.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp.h#6 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp.h#6 (text+ko) ====

@@ -78,12 +78,7 @@
 
 #define	TCPOPT_EOL		0
 #define	   TCPOLEN_EOL			1
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/tcp.h#26
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/tcp.h#27
 #define	TCPOPT_PAD		0		/* padding after EOL */
-==== YOURS //andre_flirtbox/tcp_reass/netinet/tcp.h
-#define	TCPOPT_PAD		0
-<<<<
 #define	   TCPOLEN_PAD			1
 #define	TCPOPT_NOP		1
 #define	   TCPOLEN_NOP			1