aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails/app/templates/config/locales/en.yml
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-01-23 19:45:25 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-01-23 19:45:25 +1100
commit1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d (patch)
tree750e10199be244bb5676ea615dbf49dee38b7fd4 /railties/lib/generators/rails/app/templates/config/locales/en.yml
parentbd24c75fc619fa80af03662cc4dd18fc9b70cafb (diff)
parent8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff)
downloadrails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.tar.gz
rails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.tar.bz2
rails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/generators/rails/app/templates/config/locales/en.yml')
-rw-r--r--railties/lib/generators/rails/app/templates/config/locales/en.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/locales/en.yml b/railties/lib/generators/rails/app/templates/config/locales/en.yml
index f265c068d8..a747bfa698 100644
--- a/railties/lib/generators/rails/app/templates/config/locales/en.yml
+++ b/railties/lib/generators/rails/app/templates/config/locales/en.yml
@@ -2,4 +2,4 @@
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
en:
- hello: "Hello world" \ No newline at end of file
+ hello: "Hello world"