From 562e6338a04b6ed0aff6ec6a77165f54ea99f6f6 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@privategrity.com>
Date: Tue, 1 Feb 2022 21:43:20 +0000
Subject: [PATCH] Update network.go
---
interfaces/params/network.go | 3 ---
1 file changed, 3 deletions(-)
diff --git a/interfaces/params/network.go b/interfaces/params/network.go
index 28ecdf5aa..7e3b6f4ab 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()
--
GitLab