remove stray line

rails · Sep 26, 2011 · 7d603ff · 7d603ff
1 parent 2d7dd9b
commit 7d603ff
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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