diff options
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
| -rw-r--r-- | activesupport/test/option_merger_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb index baa2cd30f3..f5287d5725 100644 --- a/activesupport/test/option_merger_test.rb +++ b/activesupport/test/option_merger_test.rb @@ -2,7 +2,7 @@ require 'test/unit' unless defined? ActiveSupport::OptionMerger require File.dirname(__FILE__) + '/../lib/active_support/option_merger' - require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object_and_class' + require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object' end class OptionMergerTest < Test::Unit::TestCase |