diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-10 07:37:41 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-10 07:37:41 -0800 |
| commit | 5aff21829d0c0929ef3ca1645a51514a1f344d08 (patch) | |
| tree | 9a0eaed3fafe62b81c03d7a9f30f1f4e656fd799 /activesupport | |
| parent | 95dd699c3649a56cabf7676534ec2ef65f3341fe (diff) | |
| parent | c112721b44cc1b4446ee4e9e4080d2b630c0b09e (diff) | |
| download | rails-5aff21829d0c0929ef3ca1645a51514a1f344d08.tar.gz rails-5aff21829d0c0929ef3ca1645a51514a1f344d08.tar.bz2 rails-5aff21829d0c0929ef3ca1645a51514a1f344d08.zip | |
Merge pull request #8643 from tricknotes/remove-method-redefined-warning
Remove method redefined warning
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/i18n.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb index 188653bd9b..8d8bf02927 100644 --- a/activesupport/lib/active_support/i18n.rb +++ b/activesupport/lib/active_support/i18n.rb @@ -1,4 +1,5 @@ begin + require 'active_support/core_ext/hash/deep_merge' require 'i18n' require 'active_support/lazy_load_hooks' rescue LoadError => e |