From: Jesse Luehrs Date: Mon, 7 Mar 2011 00:26:01 +0000 (-0600) Subject: add some more conflicts X-Git-Tag: 1.9905~20 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d85b2080199a464213695faabbb26b2ad29225f1;p=gitmo%2FMoose.git add some more conflicts --- diff --git a/dist.ini b/dist.ini index 26e5315..225ca2f 100644 --- a/dist.ini +++ b/dist.ini @@ -114,7 +114,7 @@ MooseX::Aliases = 0.08 MooseX::AlwaysCoerce = 0.12 MooseX::AttributeHelpers = 0.22 MooseX::AttributeInflate = 0.02 -MooseX::Attribute::Deflator = 1.130000 +MooseX::Attribute::Deflator = 1.130002 MooseX::Attribute::Dependent = 1.0.0 MooseX::Attribute::Prototype = 0.10 MooseX::ClassAttribute = 0.23 @@ -126,16 +126,19 @@ MooseX::LazyRequire = 0.05 MooseX::MethodAttributes = 0.22 MooseX::NonMoose = 0.17 MooseX::Params::Validate = 0.05 -MooseX::POE = 0.205 +MooseX::POE = 0.211 MooseX::Role::Cmd = 0.06 +MooseX::Role::Parameterized = 0.23 MooseX::Role::WithOverloading = 0.07 MooseX::SemiAffordanceAccessor = 0.05 +MooseX::SetOnce = 0.100472 MooseX::Singleton = 0.25 MooseX::StrictConstructor = 0.12 MooseX::Types = 0.19 MooseX::UndefTolerant = 0.04 namespace::autoclean = 0.08 Pod::Elemental = 0.093280 +Reaction = 0.002003 [Git::Check] allow_dirty =