From 0e8d8a09a5e8bcf77b865d2c023f9e4ecd6adfa3 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sat, 16 Mar 2002 22:15:33 +0000
Subject: [PATCH] Update conflict merge for 5.6.1. This is a rotten hack, but
 it works for all FreeBSD purposes.

---
 contrib/perl5/configpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/perl5/configpm b/contrib/perl5/configpm
index cd117f29a86..656e379d33b 100755
--- a/contrib/perl5/configpm
+++ b/contrib/perl5/configpm
@@ -18,7 +18,7 @@ my $glossary = $ARGV[1] || 'Porting/Glossary';
 
 
 open CONFIG, ">$config_pm" or die "Can't open $config_pm: $!\n";
-$myver = "v5.6.0"; # XXX - Yuck - allow bootstrapping. MarkM
+$myver = "v5.6.1"; # XXX - Yuck - allow bootstrapping. MarkM
 
 print CONFIG <<'ENDOFBEG_NOQ', <<"ENDOFBEG";
 package Config;