X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=c30824e78d05dde5f085675b594b04f9795270fd;hp=c016f5ae54db239e9093e72f51c40bd24d8eef18;hb=ef41ea15458d2d2beddee792deea598249df2852;hpb=3245a7701a8e15f08a6a881c58055dfd95c6cf33

diff --git a/Makefile.PL b/Makefile.PL
index c016f5a..c30824e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -129,6 +129,8 @@ 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.10016', # _config accessor in ::Credential::Password
+                                                     # make tests work with psgi
     'Catalyst::Authentication::Credential::HTTP' => '1.009',
     'Catalyst::Plugin::Session::Store::File' => '0.16',
     'Catalyst::Plugin::Session' => '0.21',