Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove stray line

  • Loading branch information...
commit 7d603ff7f27a1727c419f7bfe3828f6bca0515ab 1 parent 2d7dd9b
@vijaydev vijaydev authored
View
1  activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1516,7 +1516,6 @@ def test_association_attributes_are_available_to_after_initialize
assert_equal car.id, bulb.attributes_after_initialize['car_id']
end
-<<<<<<< HEAD
def test_overriding_reflection_build_association_with_deprecated_method_signature
ActiveRecord::Reflection::AssociationReflection.class_eval do
alias_method :old_build_association, :build_association
Please sign in to comment.
Something went wrong with that request. Please try again.