Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Aug 5, 2021

Fix the silent merge conflict introduced in commit 7d60f7e

@fanquake fanquake added the Tests label Aug 5, 2021
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6666ec9 - fixes:

test/miner_tests.cpp: In member function ‘void miner_tests::CreateNewBlock_validity::test_method()’:
test/miner_tests.cpp:219:32: error: ‘VERSIONBITS_TOP_BITS’ was not declared in this scope
  219 |             pblock->nVersion = VERSIONBITS_TOP_BITS;
      |                                ^~~~~~~~~~~~~~~~~~~~
make[2]: *** [Makefile:15329: test/test_bitcoin-miner_tests.o] Error 1

@fanquake fanquake merged commit c4b42aa into bitcoin:master Aug 5, 2021
@maflcko maflcko deleted the 2108-testMissingInclude branch August 5, 2021 08:01
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Aug 5, 2021
6666ec9 test: Add missing include (MarcoFalke)

Pull request description:

  Fix the silent merge conflict introduced in commit 7d60f7e

ACKs for top commit:
  fanquake:
    ACK 6666ec9 - fixes:

Tree-SHA512: c712715db4a41cf6ed991fb35482d8fd9016b5a27e1309654018219ebbfd8d4f98a389bdf5d7b792e7a4690928aeef943c716465b0c5e00f70320ad2e134ebb5
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Aug 16, 2022
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.

2 participants