Merge pull request #8643 from tricknotes/remove-method-redefined-warning

Remove method redefined warning
2013-02-10 07:37:41 -08:00 · 2013-02-10 07:37:41 -08:00 · 5aff21829d
commit 5aff21829d
parent 95dd699c36 c112721b44
1 changed files with 1 additions and 0 deletions
--- 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