From 82368596df3ed125060bdbba96657e544958df79 Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Mon, 12 Nov 2018 19:21:17 -0800
Subject: [PATCH] fix merge conflict

---
 src/connection.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/connection.cpp b/src/connection.cpp
index 4c77b92..a8aacb2 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -106,7 +106,6 @@ void ConnectionLoader::createZcashConf() {
             
         QTextStream out(&file); 
         
-        out << "addnode=mainnet.z.cash\n";
         out << "server=1\n";
         out << "addnode=mainnet.z.cash\n";
         out << "rpcuser=zec-qt-wallet\n";