bad merge in softlayer_server_relaunch.rb

[matburstorm]

there's the detritus from a git merge in this module, and it looks like there's duplicate of the method... not sure which one is correct :)

[cphrmky]

@matburstorm would you be so kind as to point out the specific file[s] and line[s] you're referring to?

[matburstorm]

On 05/14/2015 08:13 AM, Matt Eldridge wrote:

@matburstorm https://github.com/matburstorm would you be so kind as to point out the specific file[s] and line[s] you're referring to?

— Reply to this email directly or view it on GitHub https://github.com/softlayer/knife-softlayer/issues/24#issuecomment-102067925.

Here's my commit to a local repo:

diff --git a/lib/chef/knife/softlayer_server_relaunch.rb b/lib/chef/knife/softlayer_server_relaunch.rb index cd41e19..fe36a06 100644 --- a/lib/chef/knife/softlayer_server_relaunch.rb +++ b/lib/chef/knife/softlayer_server_relaunch.rb @@ -1,3 +1,4 @@ +# -- coding: utf-8 --

Author:: Matt Eldridge ([email protected])

© Copyright IBM Corporation 2014.

@@ -100,8 +101,6 @@ class Chef end end

-||||||| merged common ancestors -=======

Author:: Matt Eldridge ([email protected])

© Copyright IBM Corporation 2014.