Merge branch 'master' into openstreetbugs

[rails.git] / vendor / gems / composite_primary_keys-2.2.2 / test / fixtures / tariffs.yml

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariffs.yml b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariffs.yml
index 7346fc510a6adc45b48ca4264ee14735cf4ae632..997ebb8f142b08519484b6efe274557c9fe1c167 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariffs.yml
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/tariffs.yml
@@ -1,13 +1,13 @@
-flat:\r
-  tariff_id: 1\r
-  start_date: <%= Date.today.to_s(:db) %>\r
-  amount: 50\r
-free:\r
-  tariff_id: 2\r
-  start_date: <%= Date.today.to_s(:db) %>\r
-  amount: 0\r
-flat_future:\r
-  tariff_id: 1\r
-  start_date: <%= Date.today.next.to_s(:db) %>\r
-  amount: 100\r
+flat:
+  tariff_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 50
+free:
+  tariff_id: 2
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 0
+flat_future:
+  tariff_id: 1
+  start_date: <%= Date.today.next.to_s(:db) %>
+  amount: 100
   
\ No newline at end of file