diff options
| -rw-r--r-- | activerecord/test/cases/identity_map_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
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 |