From owner-cvs-contrib  Tue Apr 28 00:39:49 1998
Return-Path: <owner-cvs-contrib>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id AAA13929
          for cvs-contrib-outgoing; Tue, 28 Apr 1998 00:39:49 -0700 (PDT)
          (envelope-from owner-cvs-contrib)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id AAA13850;
          Tue, 28 Apr 1998 00:39:34 -0700 (PDT)
          (envelope-from ache@FreeBSD.org)
From: "Andrey A. Chernov" <ache@FreeBSD.ORG>
Received: (from ache@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id AAA20801;
	Tue, 28 Apr 1998 00:37:55 -0700 (PDT)
Date: Tue, 28 Apr 1998 00:37:55 -0700 (PDT)
Message-Id: <199804280737.AAA20801@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/libreadline readline.h
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        1998/04/28 00:37:55 PDT

  Modified files:
    contrib/libreadline  readline.h 
  Log:
  Fix merge errors
  
  Revision  Changes    Path
  1.7       +10 -3     src/contrib/libreadline/readline.h