diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 14:33:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 14:33:45 +0000 |
| commit | c96e0f6eb376848410d596c5823d4e385a9adde4 (patch) | |
| tree | 6d326f49f6adbcb1e3360a256285377c0157bb53 | |
| parent | ec438d3222576459ac701a7e5ecb9d7b7449a6ee (diff) | |
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
| -rw-r--r-- | NEWS | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -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. |