aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/dependencies.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-07-10 19:41:59 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-07-10 19:41:59 +0000
commitf0c22d4ad5c61e7e683291fd42e143d1a339c3a2 (patch)
treeb6815bee5d0834955db78074e52bf07247d399a4 /activesupport/lib/active_support/dependencies.rb
parenta72ace1596c5be23cf6f3dee29232d8529053eb1 (diff)
downloadrails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.gz
rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.bz2
rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.zip
occured -> occurred. Closes #5559.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/dependencies.rb')
-rw-r--r--activesupport/lib/active_support/dependencies.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index c1da53c878..17ca446650 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -163,11 +163,11 @@ class Exception #:nodoc:
def describe_blame
return nil if blamed_files.empty?
- "This error occured while loading the following files:\n #{blamed_files.join "\n "}"
+ "This error occurred while loading the following files:\n #{blamed_files.join "\n "}"
end
def copy_blame!(exc)
@blamed_files = exc.blamed_files.clone
self
end
-end \ No newline at end of file
+end