merge conflict resolved

[chaz/p5-DBIx-Class-ResultSet-RecursiveUpdate] / Changes

diff --git a/Changes b/Changes
index b9f762315e295ac3f08037496f0685442851b87c..0b557fdee0eea3112c2bee8730bd126bd9277cff 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,7 @@
-Revision history for DBIx-Class-RecursivePUT
+Revision history for DBIx::Class::ResultSet::RecursiveUpdate
+
+0.012  Thu Sep 10 19:44:25 CEST 2009 
+       updating records linked to by many to many
 
 0.009  Sat Jun 20 16:37:57 CEST 2009
        if_not_submitted flag (experimental)