naruse	2019-03-11 23:33:45 +0900 (Mon, 11 Mar 2019)

  New Revision: 67223

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67223

  Log:
    fix merge conflict
    
    Reported by Krzysztof Rybka
    https://github.com/ruby/ruby/commit/dca69588f4a46e1ecc94eeb9e01efc8cd7cb82e4#r32684541

  Modified files:
    branches/ruby_2_6/NEWS
Index: ruby_2_6/NEWS
===================================================================
--- ruby_2_6/NEWS	(revision 67222)
+++ ruby_2_6/NEWS	(revision 67223)
@@ -572,7 +572,6 @@ sufficient information, see the ChangeLo https://github.com/ruby/ruby/blob/trunk/ruby_2_6/NEWS#L572
 
 === Stdlib compatibility issues (excluding feature bug fixes)
 
-<<<<<<< .working
 * These standard libraries have been promoted to default gems.
 
   * e2mmap
@@ -590,13 +589,6 @@ sufficient information, see the ChangeLo https://github.com/ruby/ruby/blob/trunk/ruby_2_6/NEWS#L589
   * thwait
   * tracer
 
-||||||| .merge-left.r67216
-profile.rb, Profiler__::
-
-  * Removed from standard library. No one maintains it from Ruby 2.0.0.
-
-=======
->>>>>>> .merge-right.r67217
 [BigDecimal]
 
   * The following methods are removed.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/