diff options
| author | Jesse Luehrs <doy@tozt.net> | 2010-10-31 11:04:51 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2010-10-31 11:04:51 -0500 |
| commit | dc378b60e595186cddf0b2ce35da3e6749022770 (patch) | |
| tree | dd667f647877f1f4518c2caab8550b29022ad75e /inc | |
| parent | c7f0ea46eaf630b6660e32d2cc5e7a9759bb46cf (diff) | |
| download | package-stash-dc378b60e595186cddf0b2ce35da3e6749022770.tar.gz package-stash-dc378b60e595186cddf0b2ce35da3e6749022770.zip | |
Revert "revert vivication changes for now again"
This reverts commit 67b1704808e62f27210fe992df9c45b232fe9d5b.
Conflicts:
Changes
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/MMPackageStash.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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 ) { |