Skip to content

Conversation

morcos
Copy link
Contributor

@morcos morcos commented Jan 14, 2016

@laanwj I made this a new PR since it seemed you were about to merge the other one

@MarcoFalke hopefully this won't conflict with yours

@petertodd
Copy link
Contributor

ACK morcos@b3926a2

@maflcko
Copy link
Member

maflcko commented Jan 17, 2016

ACK b3926a2. Does not conflict with mine.

@morcos
Copy link
Contributor Author

morcos commented Jan 17, 2016

@laanwj I rebased this since you merged the prior PR, but then it occurred to me that maybe I shouldn't have b/c the ACK's don't line up. Please let me know what you prefer for the future.
Anyway, its the same text that was ACK'ed

@maflcko
Copy link
Member

maflcko commented Jan 17, 2016

@morcos If this was only a rebase, you can just do git reset --hard b3926a2;git push <> -f and GitHub will show it lined up. (b3926a2 is already rebased on the latest content)

@laanwj
Copy link
Member

laanwj commented Jan 18, 2016

ACK

@laanwj laanwj merged commit 5cacb8f into bitcoin:0.12 Jan 18, 2016
laanwj added a commit that referenced this pull request Jan 18, 2016
5cacb8f Add comment about mining changes and more about priority (Alex Morcos)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants