From: Tomas Doran <bobtfish@bobtfish.net>
Date: Thu, 17 Sep 2009 13:32:16 +0000 (+0000)
Subject: Well, that got forgotten, oops
X-Git-Tag: 5.80014~46
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=68c660b55f940bd018eccabdb7e3a7d734a7ef30

Well, that got forgotten, oops
---

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.