Fix tests to work regardless of order of get_all_attributes return value (RT#81713)

[gitmo/MooseX-MetaDescription.git] / Changes

diff --git a/Changes b/Changes
index 9e167f6..fdedabe 100644 (file)
--- 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