From 77785c78063c801d0f7d9869bd669b19fd10f6fa Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 10 Jan 2012 13:24:15 -0800 Subject: FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb: --- activerecord/lib/active_record/migration.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'activerecord/lib/active_record/migration.rb') 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. -- cgit v1.2.3