Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / db / migrate / 018_move_to_innodb.rb

diff --git a/db/migrate/014_move_to_innodb.rb b/db/migrate/018_move_to_innodb.rb
similarity index 100%
rename from db/migrate/014_move_to_innodb.rb
rename to db/migrate/018_move_to_innodb.rb