From: Florian Ragwitz <rafl@debian.org>
Date: Thu, 14 Apr 2011 11:01:40 +0000 (+0200)
Subject: Agreed
X-Git-Tag: 5.80033~29
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=1af5d3fcca93b369a6e37bf0a08df85346b91f47

Agreed
---

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index b1c4c94..99c5f29 100644
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -296,11 +296,6 @@ sub _parse_attrs {
         }
     }
 
-    #I know that the original behavior was to ignore action if actions was set
-    # but i actually think this may be a little more sane? we can always remove
-    # the merge behavior quite easily and go back to having actions have
-    # presedence over action by modifying the keys. i honestly think this is
-    # superior while mantaining really high degree of compat
     my $actions;
     if( ref($self) ) {
         $actions = $self->_controller_actions;