From 886013b9e7d0135d58e1c29695b9e0717dc69eab Mon Sep 17 00:00:00 2001 From: veego Date: Mon, 12 Jun 2000 10:29:36 +0000 Subject: [PATCH] Ups, forgot to resolve one place. --- sys/netinet/ip_frag.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c index 10e9da780bd6..c57cb348660b 100644 --- a/sys/netinet/ip_frag.c +++ b/sys/netinet/ip_frag.c @@ -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"; -#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 #endif #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)