From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 18 Jun 2011 17:44:40 +0000 (-0500)
Subject: conflict on mx-attribute-deflator 2.1.5
X-Git-Tag: 2.0102
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b2685cb003b6550ffec8ae1b3d8785af671dbd7;p=gitmo%2FMoose.git

conflict on mx-attribute-deflator 2.1.5
---

diff --git a/dist.ini b/dist.ini
index 15ee370..70f045f 100644
--- a/dist.ini
+++ b/dist.ini
@@ -136,7 +136,7 @@ MooseX::AlwaysCoerce           = 0.13
 MooseX::AttributeHelpers       = 0.22
 MooseX::AttributeIndexes       = 1.0.0
 MooseX::AttributeInflate       = 0.02
-MooseX::Attribute::Deflator    = 2.1.0
+MooseX::Attribute::Deflator    = 2.1.5
 MooseX::Attribute::Dependent   = 1.1.0
 MooseX::Attribute::Prototype   = 0.10
 MooseX::CascadeClearing        = 0.03