X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=b76d549781583c23e9122cabc828b9d5e50ee6ae;hp=5491f2f7165e9b06a2053b7d2e0200303c7627ff;hb=68c660b55f940bd018eccabdb7e3a7d734a7ef30;hpb=1be0c4f8966328b3d90c5ebf82f924d97a15dfd9

diff --git a/Makefile.PL b/Makefile.PL
index 5491f2f..b76d549 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -107,6 +107,7 @@ EOF
 # NOTE - This is the version number of the _incompatible_ code,
 #        not the version number of the fixed version.
 my %conflicts = (
+    'Catalyst::Model::Akismet' => '0.02',
     'Catalyst::Component::ACCEPT_CONTEXT' => '0.06',
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
                                        # should have been a core fix.