Merge 735d6b57e7 into merged_master (Bitcoin PR #16227)

This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:21 +00:00
commit a50b652932
38 changed files with 607 additions and 607 deletions

View file

@ -11,7 +11,6 @@
#include <chainparams.h>
typedef std::vector<unsigned char> valtype;
bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER;