diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
| commit | 73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa (patch) | |
| tree | 2f1601292978a844226e16f3cef428ed760b9eb5 /actionpack/lib/action_view/helpers/active_record_helper.rb | |
| parent | 8fe01de2e8753d045408ecde3178ab4e9192bf9a (diff) | |
| parent | 90c930f45c5c6766306929241462ffff8f67b86e (diff) | |
| download | rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.gz rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.bz2 rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.zip | |
Resolved conflict
Diffstat (limited to 'actionpack/lib/action_view/helpers/active_record_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/active_record_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb index f3f204cc97..e788ebf359 100644 --- a/actionpack/lib/action_view/helpers/active_record_helper.rb +++ b/actionpack/lib/action_view/helpers/active_record_helper.rb @@ -141,7 +141,7 @@ module ActionView # # error_messages_for 'user_common', 'user', :object_name => 'user' # - # If the objects cannot be located as instance variables, you can add an extra <tt>:object</tt> paremeter which gives the actual + # If the objects cannot be located as instance variables, you can add an extra <tt>:object</tt> parameter which gives the actual # object (or array of objects to use): # # error_messages_for 'user', :object => @question.user |