summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver/conflict.rb
diff options
context:
space:
mode:
authorHiroshi SHIBATA <[email protected]>2020-09-23 21:02:56 +0900
committerHiroshi SHIBATA <[email protected]>2020-09-23 21:02:56 +0900
commit31a6eaabc165d8a222e176f2c809d90622d88ec2 (patch)
treeb5333db2c13888ede5062ccd8ecca649ea261b4c /lib/rubygems/resolver/conflict.rb
parentf56fc720ee8cd4b79824a1c3843058b662a302bd (diff)
Manually merged from https://github.com/rubygems/rubygems/pull/2636
Enable Style/EmptyLinesAroundClassBody rubocop cop.
Diffstat (limited to 'lib/rubygems/resolver/conflict.rb')
-rw-r--r--lib/rubygems/resolver/conflict.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index 2ce63feef2..4245b59bee 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -4,6 +4,7 @@
# with a spec that would be activated.
class Gem::Resolver::Conflict
+
##
# The specification that was activated prior to the conflict
@@ -150,4 +151,5 @@ class Gem::Resolver::Conflict
def requester
@failed_dep.requester
end
+
end