resolve merge conflict

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

diff --git a/Changes b/Changes
index f845cd90a925438bd61ba3d19cf2b09de7eca784..b9f762315e295ac3f08037496f0685442851b87c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,14 @@
 Revision history for DBIx-Class-RecursivePUT
 
-0.0.1  Wed Jun 18 13:09:28 2008
+0.009  Sat Jun 20 16:37:57 CEST 2009
+       if_not_submitted flag (experimental)
+
+0.006  Fri May 15 11:03:48 CEST 2009
+       Some adjustments for HTML::FormHandler
+
+0.004  Sun Apr 19 11:15:57 CEST 2009
+       Added functional interface - for easy use in Form Processors
+
+0.001  Wed Jun 18 13:09:28 2008
        Initial release.