From 9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Wed, 20 Oct 2010 16:13:49 -0300 Subject: Ups, forgot to remove one conflict tag from previous commit. --- activerecord/test/cases/identity_map_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb index 7086af614f..df77bc5af2 100644 --- a/activerecord/test/cases/identity_map_test.rb +++ b/activerecord/test/cases/identity_map_test.rb @@ -292,7 +292,6 @@ class IdentityMapTest < ActiveRecord::TestCase assert_equal [posts(:welcome)], posts assert_equal authors(:david), assert_no_queries { posts[0].author} end -<<<<<<< HEAD ############################################################################## # Behaviour releated to saving failures -- cgit v1.2.3