mirror of
https://github.com/pry/pry.git
synced 2022-11-09 12:35:05 -05:00
Fix merge conflict.
This commit is contained in:
parent
3c194717c0
commit
dfb7bf472d
1 changed files with 2 additions and 1 deletions
|
@ -134,6 +134,7 @@ class Pry
|
|||
commands[new_name].description = desc if desc
|
||||
end
|
||||
|
||||
$i = 0
|
||||
# Runs a command.
|
||||
# @param [Object] context Object which will be used as self during the
|
||||
# command.
|
||||
|
@ -151,7 +152,7 @@ class Pry
|
|||
if command.options[:argument_required] && args.empty?
|
||||
puts "The command '#{command.name}' requires an argument."
|
||||
else
|
||||
command.call(context, *args)
|
||||
command.call context, *args
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue