Merge branch 'master' into copyright

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

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariff.rb b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariff.rb
index d5cb07da162c6f62663f0dab02ad971923bbe4b6..3feba44347dd3cdb4d038018db6101e685e7637a 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariff.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariff.rb
@@ -1,6 +1,6 @@
-class Tariff < ActiveRecord::Base\r
-       set_primary_keys [:tariff_id, :start_date]\r
-       has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]\r
-       has_one :product_tariff, :foreign_key => [:tariff_id, :tariff_start_date]\r
-       has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]\r
-end\r
+class Tariff < ActiveRecord::Base
+       set_primary_keys [:tariff_id, :start_date]
+       has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+       has_one :product_tariff, :foreign_key => [:tariff_id, :tariff_start_date]
+       has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end