Permalink
Browse files

FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU 💣

  • Loading branch information...
tenderlove committed Jan 10, 2012
1 parent 5e04884 commit 77785c78063c801d0f7d9869bd669b19fd10f6fa
Showing with 0 additions and 3 deletions.
  1. +0 −3 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.

0 comments on commit 77785c7

Please sign in to comment.