diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-15 13:13:55 +0530 |
| commit | 59b03d418ff59fe6bfba6a1b651ef0ac15a2738c (patch) | |
| tree | 452b7f200c87ea8a7df1d2b651f1d4f0062e50f6 /activesupport/lib/active_support/core_ext/hash/diff.rb | |
| parent | 0be7fabd4eb77828e7deff7513faa3834d1a021a (diff) | |
| parent | 7cd88840939cac913899fa9a11281d78388672ad (diff) | |
| download | rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.gz rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.tar.bz2 rails-59b03d418ff59fe6bfba6a1b651ef0ac15a2738c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/diff.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/diff.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb index 855dcb38bc..831dee8ecb 100644 --- a/activesupport/lib/active_support/core_ext/hash/diff.rb +++ b/activesupport/lib/active_support/core_ext/hash/diff.rb @@ -1,8 +1,6 @@ class Hash # Returns a hash that represents the difference between two hashes. # - # Examples: - # # {1 => 2}.diff(1 => 2) # => {} # {1 => 2}.diff(1 => 3) # => {1 => 2} # {}.diff(1 => 2) # => {1 => 2} |