From: Dave Rolsky <autarch@urth.org>
Date: Sun, 26 Sep 2010 19:15:08 +0000 (-0500)
Subject: Also conflict on Fey::ORM
X-Git-Tag: 1.15~63
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=173cb840274371035569e437289a8d2cef1a984b;p=gitmo%2FMoose.git

Also conflict on Fey::ORM
---

diff --git a/Makefile.PL b/Makefile.PL
index 7349591..228f9fe 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,7 +71,7 @@ sub check_conflicts {
         'Catalyst'                       => '5.80017',
         'Devel::REPL'                    => '1.003008',
         'Fey'                            => '0.36',
-        'Fey::ORM'                       => '0.23',
+        'Fey::ORM'                       => '0.34',
         'File::ChangeNotify'             => '0.15',
         'KiokuDB'                        => '0.41',
         'MooseX::Aliases'                => '0.07',