From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 20 Jun 2011 18:04:39 +0000 (-0500)
Subject: add some more conflicts
X-Git-Tag: 2.0105~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=98d17a85cb37a4e469d68350893b6d67e5a37c5d;p=gitmo%2FMoose.git

add some more conflicts
---

diff --git a/dist.ini b/dist.ini
index f403dcb..4b55b2f 100644
--- a/dist.ini
+++ b/dist.ini
@@ -129,7 +129,7 @@ Devel::REPL                    = 1.003008
 Fey                            = 0.36
 Fey::ORM                       = 0.42
 File::ChangeNotify             = 0.15
-KiokuDB                        = 0.49
+KiokuDB                        = 0.51
 Markdent                       = 0.16
 MooseX::Aliases                = 0.08
 MooseX::AlwaysCoerce           = 0.13
@@ -146,6 +146,8 @@ MooseX::FollowPBP              = 0.02
 MooseX::HasDefaults            = 0.02
 MooseX::InstanceTracking       = 0.04
 MooseX::LazyRequire            = 0.06
+MooseX::Meta::Attribute::Index = 0.04
+MooseX::Meta::Attribute::Lvalue = 0.05
 MooseX::MethodAttributes       = 0.22
 MooseX::NonMoose               = 0.17
 MooseX::Params::Validate       = 0.05