Fix broken build due to conflict between #1340 and #999#1345
Fix broken build due to conflict between #1340 and #999#1345sanket1729 merged 1 commit intorust-bitcoin:masterfrom
Conversation
…itcoin#999 I will test merge commits more thoroughly before signing off on them in future, sorry.
|
Looks like I beat you @tcharding |
|
Can we merge this with a single ACK? Then I can rebase all my PRs so they are green by the time @Kixunil wakes up :) |
|
tACK c4084b9 That was quick |
|
CC @apoelstra just in case you check mentions before signing off for the day. |
|
Sure, I'll try to merge, but I think GIthub will block it even from the command-line. In any case, it will take several minutes for me to run my full test script on the merge commit :) |
Sorry. (And this is enforced on admins specifically because I fat-fingered a push a few months ago, so I don't want to turn it off for something that can be dealt with by waiting for the morning :)) |
|
No sweat, thanks man. |
|
@apoelstra please share/push your test script so that I can update my testcmd |
|
@Kixunil could you pls ack this? |
|
@RCasatta https://github.com/apoelstra/git-scripts wrapped in |
|
Can we get second ack on this one please (cc @Kixunil, @sanket1729) |
I will test merge commits more thoroughly before signing off on them in future, sorry.