Fix the silent merge conflict introduced in commit 7d60f7ec6bbf293c6f23f442a0fd985111a15ff7
test: Add missing include #22630
pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2108-testMissingInclude changing 1 files +2 −1-
MarcoFalke commented at 7:54 AM on August 5, 2021: member
-
test: Add missing include 6666ec9e05
- fanquake added the label Tests on Aug 5, 2021
- fanquake approved
-
fanquake commented at 8:00 AM on August 5, 2021: member
ACK 6666ec9e059ea66065a11f5e25c0a17d7d0834fe - 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 merged this on Aug 5, 2021
- fanquake closed this on Aug 5, 2021
- MarcoFalke deleted the branch on Aug 5, 2021
- sidhujag referenced this in commit c06ba0cdd1 on Aug 5, 2021
- DrahtBot locked this on Aug 16, 2022
Contributors
Labels