From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 3 Jan 2011 20:29:51 +0000 (-0600)
Subject: add a couple more conflicts
X-Git-Tag: 1.9902~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6045714d6197bbf0abe36fd65d619780274b567b;p=gitmo%2FMoose.git

add a couple more conflicts
---

diff --git a/dist.ini b/dist.ini
index 4fdcd06..5c43087 100644
--- a/dist.ini
+++ b/dist.ini
@@ -114,6 +114,8 @@ MooseX::Aliases                = 0.07
 MooseX::AlwaysCoerce           = 0.05
 MooseX::AttributeHelpers       = 0.22
 MooseX::AttributeInflate       = 0.02
+MooseX::Attribute::Deflator    = 1.130000
+MooseX::Attribute::Dependent   = 1.0.0
 MooseX::Attribute::Prototype   = 0.10
 MooseX::ClassAttribute         = 0.17
 MooseX::FollowPBP              = 0.02
diff --git a/xt/author/test-my-dependents.t b/xt/author/test-my-dependents.t
index f941349..960a19c 100644
--- a/xt/author/test-my-dependents.t
+++ b/xt/author/test-my-dependents.t
@@ -49,6 +49,8 @@ MooseX::AlwaysCoerce
 MooseX::App::Cmd
 MooseX::Async
 MooseX::Attribute::ENV
+MooseX::Attribute::Deflator
+MooseX::Attribute::Dependent
 MooseX::AttributeCloner
 MooseX::AttributeDefaults
 MooseX::AttributeHelpers