From: Dave Rolsky <autarch@urth.org>
Date: Sat, 24 Jul 2010 15:53:18 +0000 (-0500)
Subject: Conflict on MX::InstanceTracking 0.04 and MX::HasDefaults 0.02
X-Git-Tag: 1.09~9
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=576854ad98730d9a1cef589313f51b24620c9ce4;p=gitmo%2FMoose.git

Conflict on MX::InstanceTracking 0.04 and MX::HasDefaults 0.02
---

diff --git a/Makefile.PL b/Makefile.PL
index 771c3a2..41fd173 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -60,6 +60,8 @@ sub check_conflicts {
         'MooseX::Attribute::Prototype'   => '0.10',
         'MooseX::ClassAttribute'         => '0.13',
         'MooseX::FollowPBP'              => '0.02',
+        'MooseX::HasDefaults'            => '0.02',
+        'MooseX::InstanceTracking'       => '0.04',
         'MooseX::LazyRequire'            => '0.05',
         'MooseX::MethodAttributes'       => '0.22',
         'MooseX::NonMoose'               => '0.13',