fix merge conflict
Reported by Krzysztof Rybka https://github.com/ruby/ruby/commit/dca69588f4a46e1ecc94eeb9e01efc8cd7cb82e4#r32684541
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Added by naruse (Yui NARUSE) over 6 years ago
fix merge conflict
Reported by Krzysztof Rybka
https://github.com/ruby/ruby/commit/dca69588f4a46e1ecc94eeb9e01efc8cd7cb82e4#r32684541
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e