X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=ee226f9d549ea7f602da04edea3ef1d449bc321d;hb=90e5b064cd1cd5f9b410b8071f0addc43b0d84ed;hp=f66ec758ae0a4a8e19f0fe95f7ff6cce46f53e51;hpb=c508cb5c8f7d8c545ec1c3f29385a36b166378f9;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index f66ec75..ee226f9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -106,6 +106,9 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Controller::AllowDisable' => '0.03',
+    'Reaction' => '0.001999',
+    'Catalyst::Plugin::Upload::Image::Magick' => '0.03',
     'Catalyst::Plugin::ConfigLoader'   => '0.22', # Older versions work but
                                                   # throw Data::Visitor warns
     'Catalyst::Devel'                  => '0.09',
@@ -117,6 +120,8 @@ my %conflicts = (
     'CatalystX::Imports'               => '0.03',
     'Catalyst::Plugin::HashedCookies'  => '1.03',
     'Catalyst::Action::REST'           => '0.67',
+    'CatalystX::CRUD'                  => '0.42',
+    'CatalystX::CRUD::Model::RDBO'     => '0.20',
 );
 check_conflicts(%conflicts);