From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 10 Jun 2009 15:21:32 +0000 (+0000)
Subject: Add conflict line to Makefile.PL for Component::ACCEPT_CONTEXT
X-Git-Tag: 5.80006~61
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=33632a44f189d7d49c8060076e382f2df36d7283

Add conflict line to Makefile.PL for Component::ACCEPT_CONTEXT
---

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',