Skip to content
Browse files

remove stray line

  • Loading branch information...
1 parent 2d7dd9b commit 7d603ff7f27a1727c419f7bfe3828f6bca0515ab @vijaydev vijaydev committed Sep 26, 2011
Showing with 0 additions and 1 deletion.
  1. +0 −1 activerecord/test/cases/associations/has_many_associations_test.rb
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

0 comments on commit 7d603ff

Please sign in to comment.
Something went wrong with that request. Please try again.