diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-10 19:21:11 +0200 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2012-10-10 19:21:11 +0200 |
commit | affd05d28b3fbd0f6cbbf6e6823e352405f4fd34 (patch) | |
tree | 7aa8a2cb20a95aabdad56b9d8aa5845a8056a5b8 /guides/code | |
parent | 1fc795468525d8622cdca474a54c8310a514aa46 (diff) | |
parent | badc39fb2fed4d100d2a11fa9a1a2c84c6c33df6 (diff) | |
download | rails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.tar.gz rails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.tar.bz2 rails-affd05d28b3fbd0f6cbbf6e6823e352405f4fd34.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'guides/code')
-rw-r--r-- | guides/code/getting_started/app/assets/javascripts/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/code/getting_started/app/assets/javascripts/application.js b/guides/code/getting_started/app/assets/javascripts/application.js index 9097d830e2..93cdae76ca 100644 --- a/guides/code/getting_started/app/assets/javascripts/application.js +++ b/guides/code/getting_started/app/assets/javascripts/application.js @@ -5,7 +5,7 @@ // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. // // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. +// compiled file. // // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // GO AFTER THE REQUIRES BELOW. |