From 8da30ad6be34339124ba4cb4e36aea260dda12bc Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Fri, 30 Jun 2017 14:00:04 +0900 Subject: [Active Support] require => require_relative --- activesupport/lib/active_support/option_merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/option_merger.rb') diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index 0f2caa98f2..9edb0e6cd8 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -1,4 +1,4 @@ -require "active_support/core_ext/hash/deep_merge" +require_relative "core_ext/hash/deep_merge" module ActiveSupport class OptionMerger #:nodoc: -- cgit v1.2.3