[src/netbsd-1-5]: src/usr.bin/whois Fix merge error from 1.12.4.2.

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

details:   https://anonhg.NetBSD.org/src/rev/2c8786feaa67
branches:  netbsd-1-5
changeset: 491136:2c8786feaa67
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Apr 05 19:22:10 2001 +0000

description:
Fix merge error from 1.12.4.2.

diffstat:

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

diffs (22 lines):

diff -r b161760ad8d9 -r 2c8786feaa67 usr.bin/whois/whois.c
--- a/usr.bin/whois/whois.c     Thu Apr 05 12:53:33 2001 +0000
+++ b/usr.bin/whois/whois.c     Thu Apr 05 19:22:10 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: whois.c,v 1.12.4.2 2000/09/30 14:07:53 jhawk Exp $     */
+/*     $NetBSD: whois.c,v 1.12.4.3 2001/04/05 19:22:10 jhawk Exp $     */
 
 /*
  * RIPE version marten%ripe.net@localhost
@@ -61,11 +61,7 @@
 #if 0
 static char sccsid[] = "@(#)whois.c    8.1 (Berkeley) 6/6/93";
 #else
-<<<<<<< whois.c
-__RCSID("$NetBSD: whois.c,v 1.12.4.2 2000/09/30 14:07:53 jhawk Exp $");
-=======
-__RCSID("$NetBSD: whois.c,v 1.12.4.2 2000/09/30 14:07:53 jhawk Exp $");
->>>>>>> 1.14
+__RCSID("$NetBSD: whois.c,v 1.12.4.3 2001/04/05 19:22:10 jhawk Exp $");
 #endif
 #endif /* not lint */
 #endif /* not RIPE */