From e5157e49389faebcb42b7237d55fbf096d9c2523 Mon Sep 17 00:00:00 2001
From: afresh1 <afresh1@openbsd.org>
Date: Mon, 17 Nov 2014 20:56:47 +0000
Subject: Fix merge conflicts, remove extra files, match upstream perl-5.20.1

ok deraadt@ sthen@ espie@ miod@
---
 gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm')

diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
index b36cc388c3d..2e1483154dc 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm
@@ -4,7 +4,7 @@ package Module::Build::ModuleInfo;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 
 require Module::Metadata;
-- 
cgit v1.2.3-59-g8ed1b