From: Dave Rolsky <autarch@urth.org>
Date: Sun, 26 Sep 2010 02:57:26 +0000 (-0500)
Subject: Conflict with Fey 0.36
X-Git-Tag: 1.15~76
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4df593bbb0e8e5cc30f3a3af0903916d74c0c030;p=gitmo%2FMoose.git

Conflict with Fey 0.36
---

diff --git a/Makefile.PL b/Makefile.PL
index 13fca8a..7349591 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -70,6 +70,7 @@ sub check_conflicts {
     my %conflicts = (
         'Catalyst'                       => '5.80017',
         'Devel::REPL'                    => '1.003008',
+        'Fey'                            => '0.36',
         'Fey::ORM'                       => '0.23',
         'File::ChangeNotify'             => '0.15',
         'KiokuDB'                        => '0.41',