[src/netbsd-1-5]: src/usr.sbin/mountd Ooops, merge botch in last.

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

details:   https://anonhg.NetBSD.org/src/rev/41498edfa577
branches:  netbsd-1-5
changeset: 488294:41498edfa577
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jun 27 21:35:32 2000 +0000

description:
Ooops, merge botch in last.

diffstat:

 usr.sbin/mountd/mountd.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r b16b685650dd -r 41498edfa577 usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c  Tue Jun 27 21:34:28 2000 +0000
+++ b/usr.sbin/mountd/mountd.c  Tue Jun 27 21:35:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mountd.c,v 1.70.2.2 2000/06/27 21:34:28 thorpej Exp $   */
+/*     $NetBSD: mountd.c,v 1.70.2.3 2000/06/27 21:35:32 thorpej Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -51,11 +51,7 @@
 #if 0
 static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
 #else
-<<<<<<< mountd.c
-__RCSID("$NetBSD: mountd.c,v 1.70.2.2 2000/06/27 21:34:28 thorpej Exp $");
-=======
-__RCSID("$NetBSD: mountd.c,v 1.70.2.2 2000/06/27 21:34:28 thorpej Exp $");
->>>>>>> 1.72
+__RCSID("$NetBSD: mountd.c,v 1.70.2.3 2000/06/27 21:35:32 thorpej Exp $");
 #endif
 #endif                         /* not lint */