From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 25 Apr 2012 07:42:43 +0000 (-0500)
Subject: conflict on some things
X-Git-Tag: 2.0600~8
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e3792225ec664400d3eb00a07841a42da5732ff6;p=gitmo%2FMoose.git

conflict on some things
---

diff --git a/dist.ini b/dist.ini
index cba8eda..2969bb9 100644
--- a/dist.ini
+++ b/dist.ini
@@ -142,6 +142,8 @@ Fey::ORM                       = 0.42
 File::ChangeNotify             = 0.15
 KiokuDB                        = 0.51
 Markdent                       = 0.16
+Mason                          = 2.18
+MooseX::ABC                    = 0.05
 MooseX::Aliases                = 0.08
 MooseX::AlwaysCoerce           = 0.13
 MooseX::AttributeHelpers       = 0.22
@@ -163,10 +165,11 @@ MooseX::MethodAttributes       = 0.22
 MooseX::NonMoose               = 0.17
 MooseX::Params::Validate       = 0.05
 MooseX::PrivateSetters         = 0.03
-MooseX::POE                    = 0.211
+MooseX::POE                    = 0.214
 MooseX::Role::Cmd              = 0.06
 MooseX::Role::Parameterized    = 0.23
 MooseX::Role::WithOverloading  = 0.07
+MooseX::Scaffold               = 0.05
 MooseX::SemiAffordanceAccessor = 0.05
 MooseX::SetOnce                = 0.100473
 MooseX::Singleton              = 0.25