From: Shawn M Moore <sartak@gmail.com>
Date: Sun, 31 May 2009 02:19:54 +0000 (-0400)
Subject: Make Conflicted immutable
X-Git-Tag: 0.80~27
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=029f0ed2192d5f19d17fbdd999c20fb9e28f6d5c;p=gitmo%2FMoose.git

Make Conflicted immutable
---

diff --git a/lib/Moose.pm b/lib/Moose.pm
index ce92661..7657e40 100644
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -264,6 +264,7 @@ $_->make_immutable(
     Moose::Meta::Role
     Moose::Meta::Role::Method
     Moose::Meta::Role::Method::Required
+    Moose::Meta::Role::Method::Conflicted
 
     Moose::Meta::Role::Composite