diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-10 13:24:15 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-10 13:24:15 -0800 |
| commit | 77785c78063c801d0f7d9869bd669b19fd10f6fa (patch) | |
| tree | d4c0e8c58e4f46e545968266703d897b5a30e6d6 /activerecord | |
| parent | 5e04884bce611625a77784729bf9b8aaf60d67c8 (diff) | |
| download | rails-77785c78063c801d0f7d9869bd669b19fd10f6fa.tar.gz rails-77785c78063c801d0f7d9869bd669b19fd10f6fa.tar.bz2 rails-77785c78063c801d0f7d9869bd669b19fd10f6fa.zip | |
FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb:
Diffstat (limited to 'activerecord')
| -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. |