From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 16 Apr 2010 20:06:38 +0000 (-0500)
Subject: conflict on kioku, for the Regexp tc change
X-Git-Tag: 1.02~6
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=284dc4395a9a68cf167f7e2f28dc5236208c61de;hp=054a4168c29e629f2716fda0ac4bbadd720a848b;p=gitmo%2FMoose.git

conflict on kioku, for the Regexp tc change
---

diff --git a/Makefile.PL b/Makefile.PL
index 3b31439..78d08c1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -62,6 +62,7 @@ sub check_conflicts {
         'MooseX::StrictConstructor'     => '0.07',
         'MooseX::Types'                 => '0.19',
         'namespace::autoclean'          => '0.08',
+        'KiokuDB'                       => '0.41',
     );
 
     my $found = 0;