merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / db / migrate / 030_add_foreign_keys.rb

diff --git a/db/migrate/030_add_foreign_keys.rb b/db/migrate/030_add_foreign_keys.rb
index 1b99f664de9bae15ba00cdfe66a500840a7dc75a..02d9813bd1fa1d586b3b7e6e4d38fd09236b83ac 100644 (file)
--- a/db/migrate/030_add_foreign_keys.rb
+++ b/db/migrate/030_add_foreign_keys.rb
@@ -1,4 +1,4 @@
-require 'migrate'
+require "migrate"

 
 class AddForeignKeys < ActiveRecord::Migration
   def self.up
 
 class AddForeignKeys < ActiveRecord::Migration
   def self.up