From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 4 Apr 2011 04:34:44 +0000 (-0500)
Subject: conflicts
X-Git-Tag: 1.9906~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0a2af8c5251876b9cbccb96858c5429ca29d6ef7;p=gitmo%2FMoose.git

conflicts
---

diff --git a/dist.ini b/dist.ini
index 2a3af9e..0953a40 100644
--- a/dist.ini
+++ b/dist.ini
@@ -114,8 +114,8 @@ MooseX::Aliases                = 0.08
 MooseX::AlwaysCoerce           = 0.13
 MooseX::AttributeHelpers       = 0.22
 MooseX::AttributeInflate       = 0.02
-MooseX::Attribute::Deflator    = 1.130002
-MooseX::Attribute::Dependent   = 1.0.1
+MooseX::Attribute::Deflator    = 2.1.0
+MooseX::Attribute::Dependent   = 1.1.0
 MooseX::Attribute::Prototype   = 0.10
 MooseX::CascadeClearing        = 0.03
 MooseX::ClassAttribute         = 0.23