X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=af34df95007389a54421e07c864d0397d0f7adba;hp=a15ed5dd05e72dcbbf1c1750d7ddb81513ef5bac;hb=33632a44f189d7d49c8060076e382f2df36d7283;hpb=aa2e6d9e59b1373b13fe7c37725f3fab3b8a1e92

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