From: Dave Rolsky <autarch@urth.org>
Date: Tue, 7 Apr 2009 16:03:00 +0000 (-0500)
Subject: Update conflicts data
X-Git-Tag: 0.74^0
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4784484a2cc10cc42ee41906edcd7de79d800579;p=gitmo%2FMoose.git

Update conflicts data
---

diff --git a/Makefile.PL b/Makefile.PL
index 1796daf..278cac7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,9 +34,11 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'MooseX::Singleton'        => '0.12',
-        'MooseX::Params::Validate' => '0.05',
-        'Fey::ORM'                 => '0.12',
+        'MooseX::ClassAttribute'    => '0.07',
+        'MooseX::Singleton'         => '0.14',
+        'MooseX::StrictConstructor' => '0.07',
+        'MooseX::Params::Validate'  => '0.05',
+        'Fey::ORM'                  => '0.22',
     );
 
     my $found = 0;