From: Dave Rolsky <autarch@urth.org>
Date: Mon, 12 Jul 2010 16:18:13 +0000 (-0500)
Subject: Conflict on File::ChangeNotify for coerce changes
X-Git-Tag: 1.09~50
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=28c143f390d40727155bcc7a7bb88e49b5266ff5;p=gitmo%2FMoose.git

Conflict on File::ChangeNotify for coerce changes
---

diff --git a/Makefile.PL b/Makefile.PL
index 2b4c182..d3da7e3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -51,6 +51,7 @@ sub check_conflicts {
         'Catalyst'                      => '5.80017',
         'Devel::REPL'                   => '1.003008',
         'Fey::ORM'                      => '0.23',
+        'File::ChangeNotify'            => '0.15',
         'KiokuDB'                       => '0.41',
         'MooseX::Aliases'               => '0.07',
         'MooseX::AttributeHelpers'      => '0.22',