From owner-cvs-all  Sat Mar 16 14:15:37 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2331237B402; Sat, 16 Mar 2002 14:15:34 -0800 (PST)
Received: (from markm@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2GMFY875206;
	Sat, 16 Mar 2002 14:15:34 -0800 (PST)
	(envelope-from markm)
Message-Id: <200203162215.g2GMFY875206@freefall.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sat, 16 Mar 2002 14:15:34 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/perl5 configpm
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

markm       2002/03/16 14:15:34 PST

  Modified files:
    contrib/perl5        configpm 
  Log:
  Update conflict merge for 5.6.1. This is a rotten hack, but it
  works for all FreeBSD purposes.
  
  Revision  Changes    Path
  1.4       +1 -1      src/contrib/perl5/configpm

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message