From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sat, 25 Dec 2010 14:24:15 +0000 (+0000)
Subject: Add conflict
X-Git-Tag: 5.80030~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=e68baaf3230c5470afbedef4973d3a2e77bac90d;hp=ac057d3b3f09bb43ce8730fbc0b3a12a4be5c774

Add conflict
---

diff --git a/Makefile.PL b/Makefile.PL
index 8dbd962..4446241 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -123,6 +123,7 @@ my %conflicts = (
     'Catalyst::Plugin::ENV' => '9999', # This plugin is just stupid, full stop
                                        # should have been a core fix.
     'Catalyst::Plugin::Unicode::Encoding' => '0.2',
+    'Catalyst::Plugin::Authentication' => '0.10010', # _config accessor in ::Credential::Password
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',