Skip to content
Browse files

Ups, forgot to remove one conflict tag from previous commit.

  • Loading branch information...
1 parent 93daf1b commit 9fe0dbf8bda4d5e8fb22a80e77d04e19e1866c5f @miloops miloops committed
Showing with 0 additions and 1 deletion.
  1. +0 −1 activerecord/test/cases/identity_map_test.rb
View
1 activerecord/test/cases/identity_map_test.rb
@@ -292,7 +292,6 @@ def test_eager_loading_with_conditions_on_string_joined_table_preloads
assert_equal [posts(:welcome)], posts
assert_equal authors(:david), assert_no_queries { posts[0].author}
end
-<<<<<<< HEAD
##############################################################################
# Behaviour releated to saving failures

0 comments on commit 9fe0dbf

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