From: Dave Rolsky <autarch@urth.org>
Date: Sun, 3 Oct 2010 21:24:55 +0000 (-0500)
Subject: Update conflict for catalyst
X-Git-Tag: 1.15~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=69fdd97dadd9b0af36af3635b1db9b249962de44;p=gitmo%2FMoose.git

Update conflict for catalyst
---

diff --git a/Makefile.PL b/Makefile.PL
index d295362..706c8c1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -69,7 +69,7 @@ WriteAll();
 # before a release.
 sub check_conflicts {
     my %conflicts = (
-        'Catalyst'                       => '5.80017',
+        'Catalyst'                       => '5.80028',
         'Devel::REPL'                    => '1.003008',
         'Fey'                            => '0.36',
         'Fey::ORM'                       => '0.34',