X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=40f87be46adc27cb8d5a5afd9061a83b02818a60;hb=e7e4c4697a2a0f13fd8d250cb0b6b080013747b5;hp=ed5f13dc9a0849760e0d6ed80d46acabac50339f;hpb=5e177741088e696314b644f0e0a11d700a89d9d0;p=catagits%2FCatalyst-Runtime.git

diff --git a/Makefile.PL b/Makefile.PL
index ed5f13d..40f87be 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -130,6 +130,7 @@ my %conflicts = (
     'Catalyst::Action::REST'           => '0.67',
     'CatalystX::CRUD'                  => '0.42',
     'CatalystX::CRUD::Model::RDBO'     => '0.20',
+    'Catalyst::View::Mason'            => '0.17',
 );
 check_conflicts(%conflicts);