diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
| commit | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch) | |
| tree | 8438f6f784df9b252c0f834bc7cb9c369103d4cd /activesupport/lib/active_support/xml_mini/jdom.rb | |
| parent | 5025ae610f89989f3e15241ec7065e3d443614d9 (diff) | |
| parent | 9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff) | |
| download | rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2 rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/xml_mini/jdom.rb')
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/jdom.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb index 1cd714d864..5c3d93c4a1 100644 --- a/activesupport/lib/active_support/xml_mini/jdom.rb +++ b/activesupport/lib/active_support/xml_mini/jdom.rb @@ -78,7 +78,7 @@ module ActiveSupport # Merge all the texts of an element into the hash # # hash:: - # Hash to add the converted emement to. + # Hash to add the converted element to. # element:: # XML element whose texts are to me merged into the hash def merge_texts!(hash, element) |