resolve conflicts

This commit is contained in:
Marko Baricevic
2019-07-23 10:48:52 +02:00
11 changed files with 84 additions and 39 deletions

View File

@ -248,6 +248,9 @@ cache_size = 10000
# 2) "v1" - refactor of v0 version for better testability
version = "v0"
# Limit the size of TxMessage
max_msg_bytes = 1048576
##### consensus configuration options #####
[consensus]