From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 10 Feb 2011 07:19:18 +0000 (-0600)
Subject: conflicts
X-Git-Tag: 1.9903~21
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=285adde3f5b418819eaa9281e6939fc0f21226c3;p=gitmo%2FMoose.git

conflicts
---

diff --git a/dist.ini b/dist.ini
index 24a1f2e..97c64cd 100644
--- a/dist.ini
+++ b/dist.ini
@@ -110,7 +110,7 @@ Fey::ORM                       = 0.34
 File::ChangeNotify             = 0.15
 KiokuDB                        = 0.49
 Markdent                       = 0.16
-MooseX::Aliases                = 0.07
+MooseX::Aliases                = 0.08
 MooseX::AlwaysCoerce           = 0.12
 MooseX::AttributeHelpers       = 0.22
 MooseX::AttributeInflate       = 0.02
@@ -118,12 +118,13 @@ MooseX::Attribute::Deflator    = 1.130000
 MooseX::Attribute::Dependent   = 1.0.0
 MooseX::Attribute::Prototype   = 0.10
 MooseX::ClassAttribute         = 0.17
+MooseX::Constructor::AllErrors = 0.012
 MooseX::FollowPBP              = 0.02
 MooseX::HasDefaults            = 0.02
 MooseX::InstanceTracking       = 0.04
 MooseX::LazyRequire            = 0.05
 MooseX::MethodAttributes       = 0.22
-MooseX::NonMoose               = 0.15
+MooseX::NonMoose               = 0.17
 MooseX::Params::Validate       = 0.05
 MooseX::POE                    = 0.205
 MooseX::Role::Cmd              = 0.06