From fa8af6693d608924c6d66b33539c6769329d8a48 Mon Sep 17 00:00:00 2001 From: Hailee Kenney Date: Wed, 1 Oct 2014 11:32:12 -0700 Subject: [PATCH] (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. --- lib/puppet/face/strings.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/puppet/face/strings.rb b/lib/puppet/face/strings.rb index 697d4e1..200ff35 100644 --- a/lib/puppet/face/strings.rb +++ b/lib/puppet/face/strings.rb @@ -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