fix merge conflict
This commit is contained in:
@@ -106,7 +106,6 @@ void ConnectionLoader::createZcashConf() {
|
|||||||
|
|
||||||
QTextStream out(&file);
|
QTextStream out(&file);
|
||||||
|
|
||||||
out << "addnode=mainnet.z.cash\n";
|
|
||||||
out << "server=1\n";
|
out << "server=1\n";
|
||||||
out << "addnode=mainnet.z.cash\n";
|
out << "addnode=mainnet.z.cash\n";
|
||||||
out << "rpcuser=zec-qt-wallet\n";
|
out << "rpcuser=zec-qt-wallet\n";
|
||||||
|
|||||||
Reference in New Issue
Block a user