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 /activeresource/lib/active_resource/http_mock.rb | |
| parent | 8fe01de2e8753d045408ecde3178ab4e9192bf9a (diff) | |
| parent | 90c930f45c5c6766306929241462ffff8f67b86e (diff) | |
| download | rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.gz rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.bz2 rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.zip | |
Resolved conflict
Diffstat (limited to 'activeresource/lib/active_resource/http_mock.rb')
| -rw-r--r-- | activeresource/lib/active_resource/http_mock.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/http_mock.rb b/activeresource/lib/active_resource/http_mock.rb index 22f83ae910..554fc3bcfc 100644 --- a/activeresource/lib/active_resource/http_mock.rb +++ b/activeresource/lib/active_resource/http_mock.rb @@ -65,7 +65,7 @@ module ActiveResource class << self # Returns an array of all request objects that have been sent to the mock. You can use this to check - # wether or not your model actually sent an HTTP request. + # if your model actually sent an HTTP request. # # ==== Example # def setup |