From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Wed, 12 Mar 2008 02:27:56 +0000 (+0000)
Subject: Fix Changes mismerge
X-Git-Tag: 0.04999_03~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=28357fd3c882bcd1fa8c1247a7b91c1f16fcb7f3;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Fix Changes mismerge
---

diff --git a/Changes b/Changes
index b221943..f325400 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+Not yet released
+        - Fix DB2 support
+
 0.04999_02 Tue Feb 12, 2008
         - Add is_auto_increment detection for Oracle
         - Unnhide the Oracle module now that the CPAN perms are sorted
@@ -15,7 +18,6 @@ Revision history for Perl extension DBIx::Class::Schema::Loader
         - Set is_auto_increment for auto-increment columns (RT #31473)
           (Only SQLite, MySQL and PostgreSQL are currently supported)
         - Generate one-to-one accessors for unique foreign keys (ilmari)
-        - Fix DB2 support
         - Add support for load_namespaces-style class layout
         - Fix test skip count for main skip_rels block
         - Fix auto-inc column creation for the Oracle tests