From: Dave Rolsky <autarch@urth.org>
Date: Mon, 27 Sep 2010 22:34:33 +0000 (-0500)
Subject: conflict with markdent
X-Git-Tag: 1.15~18
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=64d27dc363387531566ddf75db182f9bd3fee4f0;p=gitmo%2FMoose.git

conflict with markdent
---

diff --git a/Makefile.PL b/Makefile.PL
index 0815b8b..d295362 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -75,6 +75,7 @@ sub check_conflicts {
         'Fey::ORM'                       => '0.34',
         'File::ChangeNotify'             => '0.15',
         'KiokuDB'                        => '0.41',
+        'Markdent'                       => '0.16',
         'MooseX::Aliases'                => '0.07',
         'MooseX::AlwaysCoerce'           => '0.05',
         'MooseX::AttributeHelpers'       => '0.22',