X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Changes;fp=Changes;h=fdedabe673c6888bc000ceab9523b48b1828411b;hb=c2ee66fee5f503ef3c08fb93975ddef34c172ea7;hp=9e167f6f94211b02eb0157db83ae79eabf21734f;hpb=55e9fc1b72bb8293dcec38e96eb00b469cba90f9;p=gitmo%2FMooseX-MetaDescription.git

diff --git a/Changes b/Changes
index 9e167f6..fdedabe 100644
--- a/Changes
+++ b/Changes
@@ -3,9 +3,12 @@ Revision history for Perl extension MooseX::MetaDescription
     * 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