Merge branch 'master' into copyright

[rails.git] / vendor / gems / composite_primary_keys-2.2.2 / test / fixtures / article.rb

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/article.rb b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/article.rb
index 7233f8126527130b510aa2d33e8fc963a2b34343..7fae392bdbe0907d69f0902f6c858279f0cda59a 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/article.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/article.rb
@@ -1,5 +1,5 @@
-class Article < ActiveRecord::Base\r
-  has_many :readings\r
-  has_many :users, :through => :readings\r
-end\r
-\r
+class Article < ActiveRecord::Base
+  has_many :readings
+  has_many :users, :through => :readings
+end
+