From c96e0f6eb376848410d596c5823d4e385a9adde4 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Mar 2019 14:33:45 +0000
Subject: 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
---
 NEWS | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/NEWS b/NEWS
index 1acc5ceb05..bf1101c92f 100644
--- a/NEWS
+++ b/NEWS
@@ -572,7 +572,6 @@ sufficient information, see the ChangeLog file or Redmine
 
 === 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 ChangeLog file or Redmine
   * 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.
-- 
cgit v1.2.3