bump version to 0.80

[gitmo/Moose.git] / lib / Moose.pm

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 3c24df2..58adb1c 100644 (file)
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -3,7 +3,7 @@ package Moose;
 
 use 5.008;
 
-our $VERSION   = '0.79';
+our $VERSION   = '0.80';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -264,6 +264,7 @@ $_->make_immutable(
     Moose::Meta::Role
     Moose::Meta::Role::Method
     Moose::Meta::Role::Method::Required
+    Moose::Meta::Role::Method::Conflicting
 
     Moose::Meta::Role::Composite
 
@@ -438,10 +439,9 @@ is expected to have consumed.
 =item I<required =E<gt> (1|0)>
 
 This marks the attribute as being required. This means a value must be
-supplied during class construction or be lazy with either a default or a
-builder. Note that c<required> does not say anything about the attribute's
-value, so it could be C<undef>.
-
+supplied during class construction, I<or> the attribute must be lazy
+and have either a default or a builder. Note that c<required> does not
+say anything about the attribute's value, which can be C<undef>.
 
 =item I<weak_ref =E<gt> (1|0)>