summaryrefslogtreecommitdiff
path: root/lib/rubygems
diff options
context:
space:
mode:
authorbronzdoc <lsagastume1990@gmail.com>2019-06-22 16:58:55 -0600
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-07-31 07:47:01 +0800
commit5eacb4c52ed52185d78aa1437c0a69ed986a95f6 (patch)
treed2e943b07ee9c726c57855b4e3da4322d8cf4928 /lib/rubygems
parenta7bce01175762ba763148fe29f5cbadf5d0f6250 (diff)
[rubygems/rubygems] Remove conflict.rb code that was supposed to be removed in Rubygems 3
https://github.com/rubygems/rubygems/commit/6d5f743a89
Diffstat (limited to 'lib/rubygems')
-rw-r--r--lib/rubygems/resolver/conflict.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index fb1e661b21..2b337db339 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -153,8 +153,3 @@ class Gem::Resolver::Conflict
end
end
-
-##
-# TODO: Remove in RubyGems 3
-
-Gem::Resolver::DependencyConflict = Gem::Resolver::Conflict # :nodoc: