Merge branch 'master' into copyright

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

diff --git a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/articles.yml b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/articles.yml
index e51060463d0ec079331683ba99216981b519d36f..f4cb4778a075467767fe837a2613ad2d306a5e65 100644 (file)
--- a/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/articles.yml
+++ b/vendor/gems/composite_primary_keys-2.2.2/test/fixtures/articles.yml
@@ -1,6 +1,6 @@
-first:\r
-  id: 1\r
-  name: Article One\r
-second:\r
-  id: 2\r
+first:
+  id: 1
+  name: Article One
+second:
+  id: 2
   name: Article Two
\ No newline at end of file