Version 0.06

diff --git a/Changes b/Changes
index fdedabe..54174c6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,14 +1,12 @@
 Revision history for Perl extension MooseX::MetaDescription
 
+0.06 Tue. Dec 11, 2012
     * Fix tests to work regardless of order of get_all_attributes
       return value (RT#81713)
 
-<<<<<<< HEAD
 0.05 Sat. Mar 3, 2012
     * Fix undeclared dependency on Test::Excpetion. RT#75491
 
-=======
->>>>>>> 3724a0d... Fix tests to work regardless of order of get_all_attributes return value (RT#81713)
 0.04 Tue. Feb 8, 2010
     * Fix tests to work without undocumented features which
       aren't present in the latest refactor of attributes in roles

diff --git a/README b/README
index b4c76db..c66e7e1 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-MooseX::MetaDescription version 0.05
+MooseX::MetaDescription version 0.06
 ===========================
 
 See the individual module documentation for more information

diff --git a/lib/MooseX/MetaDescription.pm b/lib/MooseX/MetaDescription.pm
index ef618f7..787750e 100644 (file)
--- a/lib/MooseX/MetaDescription.pm
+++ b/lib/MooseX/MetaDescription.pm
@@ -1,7 +1,7 @@
 package MooseX::MetaDescription;
 use Moose;
 
-our $VERSION   = '0.05';
+our $VERSION   = '0.06';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use MooseX::MetaDescription::Meta::Class;

diff --git a/lib/MooseX/MetaDescription/Description.pm b/lib/MooseX/MetaDescription/Description.pm
index e8c0a12..cbd94db 100644 (file)
--- a/lib/MooseX/MetaDescription/Description.pm
+++ b/lib/MooseX/MetaDescription/Description.pm
@@ -1,7 +1,7 @@
 package MooseX::MetaDescription::Description;
 use Moose;
 
-our $VERSION   = '0.05';
+our $VERSION   = '0.06';
 our $AUTHORITY = 'cpan:STEVAN';
 
 has 'descriptor' => (

diff --git a/lib/MooseX/MetaDescription/Meta/Attribute.pm b/lib/MooseX/MetaDescription/Meta/Attribute.pm
index 7e9e729..ae3c01f 100644 (file)
--- a/lib/MooseX/MetaDescription/Meta/Attribute.pm
+++ b/lib/MooseX/MetaDescription/Meta/Attribute.pm
@@ -1,7 +1,7 @@
 package MooseX::MetaDescription::Meta::Attribute;
 use Moose;
 
-our $VERSION   = '0.05';
+our $VERSION   = '0.06';
 our $AUTHORITY = 'cpan:STEVAN';
 
 extends 'Moose::Meta::Attribute';

diff --git a/lib/MooseX/MetaDescription/Meta/Class.pm b/lib/MooseX/MetaDescription/Meta/Class.pm
index 9cd99ba..d3d1d97 100644 (file)
--- a/lib/MooseX/MetaDescription/Meta/Class.pm
+++ b/lib/MooseX/MetaDescription/Meta/Class.pm
@@ -1,7 +1,7 @@
 package MooseX::MetaDescription::Meta::Class;
 use Moose;
 
-our $VERSION   = '0.05';
+our $VERSION   = '0.06';
 our $AUTHORITY = 'cpan:STEVAN';
 
 extends 'Moose::Meta::Class';

diff --git a/lib/MooseX/MetaDescription/Meta/Trait.pm b/lib/MooseX/MetaDescription/Meta/Trait.pm
index ecbc840..242529c 100644 (file)
--- a/lib/MooseX/MetaDescription/Meta/Trait.pm
+++ b/lib/MooseX/MetaDescription/Meta/Trait.pm
@@ -1,7 +1,7 @@
 package MooseX::MetaDescription::Meta::Trait;
 use Moose::Role;
 
-our $VERSION   = '0.05';
+our $VERSION   = '0.06';
 our $AUTHORITY = 'cpan:STEVAN';
 
 has 'description' => (