X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=d851efd0e7a7e82d89d191779925e0357e267451;hp=faafffa61df2c64509b040eb5e6e0a7db85b463d;hb=69db240eb72e649e5bad28e9e1cc7656c3fcf9e8;hpb=1667a59502969244378a3d0ccb4aefe9420707f1

diff --git a/Makefile.PL b/Makefile.PL
index faafffa..d851efd 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -113,6 +113,7 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Plugin::SubRequest' => '0.14',
     'Catalyst::Model::Akismet' => '0.02',
     'Catalyst::Component::ACCEPT_CONTEXT' => '0.06',
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop