X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FView.pm;h=1959a77729c323f2bb05ef35ce48592a81007109;hb=df3956bf69b7112ca1064d187b6313182a6b8902;hp=ef5a44704709e62f048bedbdea7a3a4687c1ea0f;hpb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/View.pm b/lib/Catalyst/View.pm index ef5a447..1959a77 100644 --- a/lib/Catalyst/View.pm +++ b/lib/Catalyst/View.pm @@ -1,7 +1,5 @@ package Catalyst::View; -use MRO::Compat; -use mro 'c3'; use Moose; extends qw/Catalyst::Component/; @@ -48,16 +46,9 @@ sub process { } -=head2 $c->merge_hash_config( $hashref, $hashref ) +=head1 AUTHORS -Merges two hashes together recursively, giving right-hand precedence. - -=cut - -=head1 AUTHOR - -Sebastian Riedel, C -Marcus Ramberg, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT @@ -67,6 +58,6 @@ the same terms as Perl itself. =cut no Moose; -#__PACKAGE__->meta->make_immutable(); +__PACKAGE__->meta->make_immutable(); 1;