From dc378b60e595186cddf0b2ce35da3e6749022770 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 31 Oct 2010 11:04:51 -0500 Subject: Revert "revert vivication changes for now again" This reverts commit 67b1704808e62f27210fe992df9c45b232fe9d5b. Conflicts: Changes --- inc/MMPackageStash.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc') diff --git a/inc/MMPackageStash.pm b/inc/MMPackageStash.pm index cab44dc..93c04e4 100644 --- a/inc/MMPackageStash.pm +++ b/inc/MMPackageStash.pm @@ -14,8 +14,8 @@ around _build_MakeFile_PL_template => sub { $template .= <<'CHECK_CONFLICTS'; sub check_conflicts { my %conflicts = ( - # 'Class::MOP' => '1.08', - # 'MooseX::Role::WithOverloading' => '0.08', + 'Class::MOP' => '1.08', + 'MooseX::Role::WithOverloading' => '0.08', ); my $found = 0; for my $mod ( sort keys %conflicts ) { -- cgit v1.2.3-54-g00ecf