Skip to content
This repository
Browse code

remove stray line

  • Loading branch information...
commit 7d603ff7f27a1727c419f7bfe3828f6bca0515ab 1 parent 2d7dd9b
Vijay Dev authored September 26, 2011
1  activerecord/test/cases/associations/has_many_associations_test.rb
@@ -1516,7 +1516,6 @@ def test_association_attributes_are_available_to_after_initialize
1516 1516
     assert_equal car.id, bulb.attributes_after_initialize['car_id']
1517 1517
   end
1518 1518
 
1519  
-<<<<<<< HEAD
1520 1519
   def test_overriding_reflection_build_association_with_deprecated_method_signature
1521 1520
     ActiveRecord::Reflection::AssociationReflection.class_eval do
1522 1521
       alias_method :old_build_association, :build_association

0 notes on commit 7d603ff

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