From c11f60f5323954d8ddf0b0442eb1f18d929b0d22 Mon Sep 17 00:00:00 2001 From: blackjok3r Date: Thu, 10 Jan 2019 02:51:03 +0800 Subject: [PATCH] fix merge problem --- src/net.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/net.h b/src/net.h index b43422184..3f30175c3 100644 --- a/src/net.h +++ b/src/net.h @@ -63,11 +63,7 @@ static const unsigned int MAX_INV_SZ = 50000; /** The maximum number of new addresses to accumulate before announcing. */ static const unsigned int MAX_ADDR_TO_SEND = 1000; /** Maximum length of incoming protocol messages (no message over 2 MiB is currently acceptable). */ -<<<<<<< HEAD -static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1024 * 1024; -======= static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1024 * 1024; // depends on MAX_BLOCK_SIZE ->>>>>>> e755fa0e7bfc079b94c0aa80e80d3b990c9f4b64 /** Maximum length of strSubVer in `version` message */ static const unsigned int MAX_SUBVERSION_LENGTH = 256; /** -listen default */