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

diff --git a/Makefile.PL b/Makefile.PL
index 22f9d44..ee226f9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -106,6 +106,8 @@ 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