From: Dave Rolsky <autarch@urth.org>
Date: Mon, 18 Oct 2010 14:44:59 +0000 (-0500)
Subject: Fix syntax error
X-Git-Tag: 1.16~5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=44c3ed25e1cedd71b64c5549e533d4ec337e142d;p=gitmo%2FMoose.git

Fix syntax error
---

diff --git a/t/010_basics/030_deprecations.t b/t/010_basics/030_deprecations.t
index 3354f2e..a1313bf 100644
--- a/t/010_basics/030_deprecations.t
+++ b/t/010_basics/030_deprecations.t
@@ -131,6 +131,7 @@ use Test::Requires {
                 q{},
                 'Providing a writer for a String trait avoids default is warning';
         }
+    );
 }
 
 {
@@ -165,18 +166,6 @@ use Test::Requires {
                 q{},
                 'Providing a accessor for a String trait avoids default is warning';
         }
-<<<<<<< HEAD
-=======
-        qr/\QThe alias and excludes options for role application have been renamed -alias and -excludes (Foo is consuming Role - do you need to upgrade Foo?)/,
-        'passing excludes or alias with a leading dash warns';
-    ::ok(
-        !Foo->meta->has_method('thing'),
-        'thing method is excluded from role application'
-    );
-    ::ok(
-        Foo->meta->has_method('thing2'),
-        'thing2 method is created as alias in role application'
->>>>>>> Move logic into Moose::Meta::Role for deprecation check of excludes and alias. Add friendlier wording to the warning. Update the test to check for new wording
     );
 
     sub _build_foo { q{} }