aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2015-12-20 12:33:46 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2015-12-20 12:33:46 +0000
commitb691d62be9357fddeca6a2ab247a423d0a4ce7ab (patch)
treeb2f20a95f16e19b19484ad411ed5742c593fa0ea /railties/lib
parentcf8621a3e9676f0c62d84dc42797e75bc6ab1a1d (diff)
parentbd3fc6d4742056d3858a9bc35a86386d62ede15d (diff)
downloadrails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.tar.gz
rails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.tar.bz2
rails-b691d62be9357fddeca6a2ab247a423d0a4ce7ab.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/test_unit/model/templates/fixtures.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
index 50ca61a35b..2656767eb4 100644
--- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
+++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
@@ -17,7 +17,7 @@
<% end -%>
<% else -%>
-# This model initially had no columns defined. If you add columns to the
+# This model initially had no columns defined. If you add columns to the
# model remove the '{}' from the fixture names and add the columns immediately
# below each fixture, per the syntax in the comments below
#
@@ -25,5 +25,5 @@ one: {}
# column: value
#
two: {}
-# column: value
+# column: value
<% end -%>