aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-03 18:47:34 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-03 18:52:30 +0530
commit3eca0ab8388a84bf34a78395edf85e30c6943c63 (patch)
treee42a0bb826973087995fe033ae32260ea24c372d /activerecord/test
parentd531cbc80959dfc35ee1dcbac133d52d63beacc9 (diff)
downloadrails-3eca0ab8388a84bf34a78395edf85e30c6943c63.tar.gz
rails-3eca0ab8388a84bf34a78395edf85e30c6943c63.tar.bz2
rails-3eca0ab8388a84bf34a78395edf85e30c6943c63.zip
Give preference to the second relation's order when merging
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relations_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 18f6152cc0..7046420ebd 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -539,5 +539,4 @@ class RelationTest < ActiveRecord::TestCase
assert ! hen.new_record?
assert_equal 'hen', hen.name
end
-
end