(maint) Fix incorrectly resolved merge conflict
Due to a merge conflict that was not properly resolved, a method which did not exist was being called in the server action, causing the action to fail. Remove the unneeded method call so that the server action will work as intended.
This commit is contained in:
parent
970b60481f
commit
fa8af6693d
|
@ -86,7 +86,6 @@ Puppet::Face.define(:strings, '0.0.1') do
|
|||
# used as the module name and the path indicates which `.yardoc` index to
|
||||
# generate documentation from.
|
||||
yard_args = %w[-m -q] + module_tuples.flatten
|
||||
merge_puppet_args!(yard_args)
|
||||
|
||||
server_actions.serve_documentation(*yard_args)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue