[Jifty-commit] r1639 - in jifty/branches/moose: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Fri Jul 21 03:10:15 2006
New Revision: 1639

Modified:
   jifty/branches/moose/Makefile.PL
   jifty/branches/moose/lib/Jifty/Action.pm

Log:
* moose branch: fix some merge errors.

Modified: jifty/branches/moose/Makefile.PL
==============================================================================
--- jifty/branches/moose/Makefile.PL	(original)
+++ jifty/branches/moose/Makefile.PL	Fri Jul 21 03:10:15 2006
@@ -44,6 +44,7 @@
 requires('Module::Pluggable' => '2.95');
 requires('Module::Refresh' => '0.09');
 requires('Module::ScanDeps');
+requires('Moose');
 requires('Object::Declare' => '0.13');
 requires('PAR::Dist::FromCPAN');
 requires('Params::Validate');

Modified: jifty/branches/moose/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/moose/lib/Jifty/Action.pm	(original)
+++ jifty/branches/moose/lib/Jifty/Action.pm	Fri Jul 21 03:10:15 2006
@@ -28,7 +28,6 @@
 no Moose;
 
 __PACKAGE__->mk_classdata(qw/PARAMS/);
-__PACKAGE__->mk_classdata(qw/PARAMS/);
 
 =head1 COMMON METHODS