From: Dave Rolsky <autarch@urth.org>
Date: Tue, 15 Sep 2009 16:16:57 +0000 (-0500)
Subject: Forgot some conflicts for the last release (but better late than never)
X-Git-Tag: 0.91~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=dd8b5451cfe7cfb38edf9fdb66f95c6d07f01693;p=gitmo%2FMoose.git

Forgot some conflicts for the last release (but better late than never)
---

diff --git a/Makefile.PL b/Makefile.PL
index af34875..cac053c 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -37,13 +37,15 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
+        'Fey::ORM'                  => '0.23',
         'MooseX::AttributeHelpers'  => '0.21',
         'MooseX::ClassAttribute'    => '0.09',
+        'MooseX::MethodAttributes'  => '0.15',
+        'MooseX::Params::Validate'  => '0.05',
         'MooseX::Singleton'         => '0.19',
         'MooseX::StrictConstructor' => '0.07',
-        'MooseX::Params::Validate'  => '0.05',
-        'Fey::ORM'                  => '0.23',
         'MooseX::Types'             => '0.19',
+        'namespace::autoclean'      => '0.08',
     );
 
     my $found = 0;