Fix conflict between 087a7a9 and 34bc066#32
Merged
Conversation
Pull request cracyc#29 added pcbios_set_key_buffer(0x00, 0x00); on line 4692: cracyc@087a7a9#diff-d87583be0959c2640137ef89d96f187428916052656066e568ba20a0a04b6040R4692 Upstream placed it on line 4657 instead: cracyc@34bc066#diff-d87583be0959c2640137ef89d96f187428916052656066e568ba20a0a04b6040R4657 So we are doing it twice and it doesn't work. Removing the one from my initial pull request and leaving the one from upstream.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull request #29 added pcbios_set_key_buffer(0x00, 0x00); on line 4692:
087a7a9#diff-d87583be0959c2640137ef89d96f187428916052656066e568ba20a0a04b6040R4692
Upstream placed it on line 4657 instead:
34bc066#diff-d87583be0959c2640137ef89d96f187428916052656066e568ba20a0a04b6040R4657
So we are doing it twice and it doesn't work.
Removing the one from my initial pull request and leaving the one from upstream.