aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-07-15 21:20:01 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2017-07-15 21:20:01 +0200
commitca63f6d1cc8854d3e113ffb94c1fcebeeb7f472e (patch)
tree30baa1af949bc5b1d9e4db05ac5f97db88f75373 /activerecord/test
parent0391bbc01bfeff876c5f9c04c3e8657b53b4d804 (diff)
downloadrails-ca63f6d1cc8854d3e113ffb94c1fcebeeb7f472e.tar.gz
rails-ca63f6d1cc8854d3e113ffb94c1fcebeeb7f472e.tar.bz2
rails-ca63f6d1cc8854d3e113ffb94c1fcebeeb7f472e.zip
Stupid empty line added after merge.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/relation_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index e4f68eef1b..a403824f1a 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -6,7 +6,6 @@ require "models/rating"
module ActiveRecord
class RelationTest < ActiveRecord::TestCase
-
fixtures :posts, :comments, :authors, :author_addresses, :ratings
FakeKlass = Struct.new(:table_name, :name) do