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

resolve conflicts from lite-2 merge

This commit is contained in:
lukem 1997-09-16 14:19:03 +00:00
parent ec31f79470
commit df57ac7d4f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/savecore/savecore.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: savecore.c,v 1.33 1997/09/16 08:37:18 mrg Exp $ */
/* $NetBSD: savecore.c,v 1.34 1997/09/16 14:19:03 lukem Exp $ */
/*-
* Copyright (c) 1986, 1992, 1993
@ -41,9 +41,9 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1992, 1993\n\
#ifndef lint
#if 0
static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94";
static char sccsid[] = "@(#)savecore.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: savecore.c,v 1.33 1997/09/16 08:37:18 mrg Exp $");
__RCSID("$NetBSD: savecore.c,v 1.34 1997/09/16 14:19:03 lukem Exp $");
#endif
#endif /* not lint */

6
sbin/savecore/savecore_old.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: savecore_old.c,v 1.4 1997/09/15 11:08:46 lukem Exp $ */
/* $NetBSD: savecore_old.c,v 1.5 1997/09/16 14:19:05 lukem Exp $ */
/*-
* Copyright (c) 1986, 1992, 1993
@ -41,9 +41,9 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1992, 1993\n\
#ifndef lint
#if 0
static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94";
static char sccsid[] = "@(#)savecore.c 8.5 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: savecore_old.c,v 1.4 1997/09/15 11:08:46 lukem Exp $");
__RCSID("$NetBSD: savecore_old.c,v 1.5 1997/09/16 14:19:05 lukem Exp $");
#endif
#endif /* not lint */