Permalink
Browse files

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

Remove method redefined warning
  • Loading branch information...
2 parents 95dd699 + c112721 commit 5aff21829d0c0929ef3ca1645a51514a1f344d08 @pixeltrix pixeltrix committed Feb 10, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 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

0 comments on commit 5aff218

Please sign in to comment.