Merge conflict in ext/binding_of_caller/ruby_headers/192/version.h #20

Closed
lparry opened this Issue Mar 20, 2013 · 2 comments

Projects

None yet

2 participants

@lparry
lparry commented Mar 20, 2013

I noticed this merge conflict: https://github.com/banister/binding_of_caller/blob/master/ext/binding_of_caller/ruby_headers/192/version.h#L2-10

Hasnt actually caused me an issue, but it looks a bit sloppy

@badosu
Collaborator
badosu commented Jun 4, 2013

Do you have an idea of which line should we use?

@lparry
lparry commented Jun 5, 2013

No idea sorry, I just stumbled across it while grepping for something else
iirc

On Tuesday, June 4, 2013, Amadeus Folego wrote:

Do you have an idea of which line should we use?


Reply to this email directly or view it on GitHubhttps://github.com/banister/binding_of_caller/issues/20#issuecomment-18914079
.

@badosu badosu added a commit that closed this issue Jun 7, 2013
@badosu badosu Fix merge not resolved
Fix #20
dcab3ad
@badosu badosu closed this in dcab3ad Jun 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment