fix merge conflict

2018-11-12 19:21:17 -08:00
parent 4204cf0a1f
commit 82368596df
1 changed files with 0 additions and 1 deletions
--- 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";