From 81ed704e7772e530e911bc6d0eabe1ca05968e4f Mon Sep 17 00:00:00 2001 From: thorpej Date: Fri, 1 Sep 1995 23:48:13 +0000 Subject: [PATCH] Fix tiny goof left over from the merge. --- usr.bin/locate/bigram/locate.bigram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c index 923174763486..ea95c7bd77af 100644 --- a/usr.bin/locate/bigram/locate.bigram.c +++ b/usr.bin/locate/bigram/locate.bigram.c @@ -1,4 +1,4 @@ -/* $NetBSD: locate.bigram.c,v 1.4 1995/08/31 22:36:32 jtc Exp $ */ +/* $NetBSD: locate.bigram.c,v 1.5 1995/09/01 23:48:13 thorpej Exp $ */ /* * Copyright (c) 1989, 1993 @@ -43,11 +43,10 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -<<<<<<< locate.bigram.c #if 0 static char sccsid[] = "@(#)locate.bigram.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$NetBSD: locate.bigram.c,v 1.4 1995/08/31 22:36:32 jtc Exp $"; +static char rcsid[] = "$NetBSD: locate.bigram.c,v 1.5 1995/09/01 23:48:13 thorpej Exp $"; #endif /* not lint */ /*