diff options
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 9093004852..fb25754f56 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,10 +1,7 @@ require "active_support/core_ext/module/delegation" require "active_support/core_ext/class/attribute_accessors" -<<<<<<< HEAD require "active_support/core_ext/array/wrap" -======= require 'active_support/deprecation' ->>>>>>> f00491b... deprecate the subdirectories parameter to `migrations` module ActiveRecord # Exception that can be raised to stop migrations from going backwards. |