From: Tomas Doran <bobtfish@bobtfish.net>
Date: Mon, 23 Nov 2009 22:57:40 +0000 (+0000)
Subject: Have a new conflict statement
X-Git-Tag: 5.80014_02~10^2~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=69db240eb72e649e5bad28e9e1cc7656c3fcf9e8

Have a new conflict statement
---

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