Merge branch 'master' into copyright

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

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/reading.rb b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/reading.rb
index 2e8197062c1cd9b006d743e0f3046f36c4579513..014d8b8101cf56c89a772b31d1b0bdbd0f4e7e84 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/reading.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/reading.rb
@@ -1,4 +1,4 @@
-class Reading < ActiveRecord::Base\r
-  belongs_to :article\r
-  belongs_to :user\r
-end \r
+class Reading < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :user
+end