From: Florian Ragwitz <rafl@debian.org>
Date: Fri, 21 Aug 2009 16:12:57 +0000 (+0000)
Subject: Conflict with the latest mason view, which blows up because of the new component_name... 
X-Git-Tag: 5.80008~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=5e4eccfbfb82a28a5773d3a9412e096a3530007e;hp=5e177741088e696314b644f0e0a11d700a89d9d0

Conflict with the latest mason view, which blows up because of the new component_name constructor arg.
---

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);