diff --git a/interfaces/params/network.go b/interfaces/params/network.go index 28ecdf5aa980259146091c06ae0a0ef7b3ee37ef..7e3b6f4ab3f72f664af8e5b7e9cc5d226950a37f 100644 --- a/interfaces/params/network.go +++ b/interfaces/params/network.go @@ -58,11 +58,8 @@ func GetDefaultNetwork() Network { FastPolling: true, BlacklistedNodes: make([]string, 0), VerboseRoundTracking: false, -<<<<<<< interfaces/params/network.go RealtimeOnly: false, -======= ReplayRequests: true, ->>>>>>> interfaces/params/network.go } n.Rounds = GetDefaultRounds() n.Messages = GetDefaultMessage()