Fixup 7bfd0e8

ruby · Jun 11, 2020 · b0f8ed6 · b0f8ed6
1 parent f0cb688
commit b0f8ed6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
@@ -1042,11 +1042,7 @@ def capabilities
  return {} unless @string[3, 1] == '-'
  h = {}
  @string.lines.drop(1).each do |line|
-<<<<<<< HEAD
- k, *v = line[4..-1].chomp.split
-=======
  k, *v = line[4..-1].split(' ')
->>>>>>> 2b7409a2f2... Specify explicit separator not to be affected by $;
  h[k] = v
  end
  h