From 5eacb4c52ed52185d78aa1437c0a69ed986a95f6 Mon Sep 17 00:00:00 2001 From: bronzdoc Date: Sat, 22 Jun 2019 16:58:55 -0600 Subject: [rubygems/rubygems] Remove conflict.rb code that was supposed to be removed in Rubygems 3 https://github.com/rubygems/rubygems/commit/6d5f743a89 --- lib/rubygems/resolver/conflict.rb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lib/rubygems') 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: -- cgit v1.2.3