Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ups, forgot to resolve one place.

This commit is contained in:
veego 2000-06-12 10:29:36 +00:00
parent d6dd29c882
commit 886013b9e7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/ip_frag.c
View File

@ -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)