search

softlayer / knife-softlayer

Other
25 stars 21 forks source link

bad merge in softlayer_server_relaunch.rb #24

Open matburstorm opened 9 years ago

matburstorm commented 9 years ago

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 commented 9 years ago

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

matburstorm commented 9 years ago

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_serverrelaunch.rb @@ -1,3 +1,4 @@ +# -- coding: utf-8 -_- #

Author:: Matt Eldridge (matt.eldridge@us.ibm.com)

© Copyright IBM Corporation 2014.

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

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

Author:: Matt Eldridge (matt.eldridge@us.ibm.com)

© Copyright IBM Corporation 2014.