@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
Release notes about mining code changes #7347
pull morcos wants to merge 1 commits into bitcoin:0.12 from morcos:rnfixes2 changing 1 files +16 −4-
morcos commented at 8:12 PM on January 14, 2016: member
-
petertodd commented at 8:52 AM on January 15, 2016: contributor
- jonasschnelli added the label Docs and Output on Jan 15, 2016
-
MarcoFalke commented at 11:12 AM on January 17, 2016: member
ACK b3926a2. Does not conflict with mine.
-
Add comment about mining changes and more about priority 5cacb8f319
- morcos force-pushed on Jan 17, 2016
-
MarcoFalke commented at 2:19 PM on January 17, 2016: member
@morcos If this was only a rebase, you can just do
git reset --hard b3926a2;git push <> -fand GitHub will show it lined up. (b3926a2 is already rebased on the latest content) -
laanwj commented at 9:35 AM on January 18, 2016: member
ACK
- laanwj merged this on Jan 18, 2016
- laanwj closed this on Jan 18, 2016
- laanwj referenced this in commit b0cb055673 on Jan 18, 2016
- MarcoFalke locked this on Sep 8, 2021
Contributors
Labels