Merge branch 'master' into copyright

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

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/user.rb b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/user.rb
index a8487c49fc3032a474b50316e8315b349e7aac96..674481835c2f5c0b7c78a15d98f249b637a278f4 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/user.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/user.rb
@@ -1,10 +1,10 @@
-class User < ActiveRecord::Base\r
-  has_many :readings\r
-  has_many :articles, :through => :readings\r
-  has_many :comments, :as => :person\r
-  has_many :hacks, :through => :comments, :source => :hack\r
-  \r
-  def find_custom_articles\r
-    articles.find(:all, :conditions => ["name = ?", "Article One"])\r
-  end\r
-end\r
+class User < ActiveRecord::Base
+  has_many :readings
+  has_many :articles, :through => :readings
+  has_many :comments, :as => :person
+  has_many :hacks, :through => :comments, :source => :hack
+  
+  def find_custom_articles
+    articles.find(:all, :conditions => ["name = ?", "Article One"])
+  end
+end