From 7d603ff7f27a1727c419f7bfe3828f6bca0515ab Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Mon, 26 Sep 2011 16:24:01 +0530 Subject: [PATCH] remove stray line --- .../test/cases/associations/has_many_associations_test.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index ff6336b373cdb..fe52cb1fb3d94 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/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