[src/trunk]: src/sys/netinet Ups, forgot to resolve one place.

[veego <veego%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7db1001812bc
branches:  trunk
changeset: 487730:7db1001812bc
user:      veego <veego%NetBSD.org@localhost>
date:      Mon Jun 12 10:29:36 2000 +0000

description:
Ups, forgot to resolve one place.

diffstat:

 sys/netinet/ip_frag.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (27 lines):

diff -r 5c02e2574223 -r 7db1001812bc sys/netinet/ip_frag.c
--- a/sys/netinet/ip_frag.c     Mon Jun 12 10:28:20 2000 +0000
+++ b/sys/netinet/ip_frag.c     Mon Jun 12 10:29:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_frag.c,v 1.20 2000/06/12 10:28:21 veego Exp $       */
+/*     $NetBSD: ip_frag.c,v 1.21 2000/06/12 10:29:36 veego Exp $       */
 
 /*
  * Copyright (C) 1993-2000 by Darren Reed.
@@ -9,15 +9,11 @@
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
-static const char rcsid[] = "$NetBSD: ip_frag.c,v 1.20 2000/06/12 10:28:21 veego Exp $";
+static const char rcsid[] = "$NetBSD: ip_frag.c,v 1.21 2000/06/12 10:29:36 veego Exp $";
 #else
 static const char sccsid[] = "@(#)ip_frag.c    1.11 3/24/96 (C) 1993-2000 Darren Reed";
-<<<<<<< ip_frag.c
-static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.10.2.3 2000/05/05 15:10:23 darrenr Exp";
+static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.10.2.4 2000/06/06 15:49:15 darrenr Exp";
 #endif
-=======
-static const char rcsid[] = "@(#)Id: ip_frag.c,v 2.10.2.4 2000/06/06 15:49:15 darrenr Exp";
->>>>>>> 1.1.1.15
 #endif
 
 #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)