X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Changes;h=54174c62afa6c662f4830ec8595b4dd8975c5366;hb=9497137d21a07be7d2ee33a6b8d312bece39c74b;hp=fdedabe673c6888bc000ceab9523b48b1828411b;hpb=c2ee66fee5f503ef3c08fb93975ddef34c172ea7;p=gitmo%2FMooseX-MetaDescription.git

diff --git a/Changes b/Changes
index fdedabe..54174c6 100644
--- 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