Permalink
Browse files

Merge pull request #9240 from tricknotes/supress-warning

Supress warning about method redifinition
  • Loading branch information...
2 parents a429d9e + cfd8525 commit 3900a160b6ccdaa27a0237e235d87fff4b54c42f @guilleiguaran guilleiguaran committed Feb 10, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 activesupport/lib/active_support/i18n.rb
@@ -1,5 +1,7 @@
begin
require 'active_support/core_ext/hash/deep_merge'
+ require 'active_support/core_ext/hash/except'
+ require 'active_support/core_ext/hash/slice'
require 'i18n'
require 'active_support/lazy_load_hooks'
rescue LoadError => e

0 comments on commit 3900a16

Please sign in to comment.