Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bad merge in softlayer_server_relaunch.rb #24

Open
matburstorm opened this issue May 10, 2015 · 2 comments
Open

bad merge in softlayer_server_relaunch.rb #24

matburstorm opened this issue May 10, 2015 · 2 comments

Comments

@matburstorm
Copy link
Contributor

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
Copy link
Member

cphrmky commented May 14, 2015

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

@matburstorm
Copy link
Contributor Author

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
#24 (comment).

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants