s/zcash/Zcash

src/init.cpp

@@ -419,10 +419,6 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-walletnotify=<cmd>", _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)"));
     strUsage += HelpMessageOpt("-zapwallettxes=<mode>", _("Delete all wallet transactions and only recover those parts of the blockchain through -rescan on startup") +
         " " + _("(1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data)"));
-<<<<<<< HEAD
-=======
-
->>>>>>> Removes out bitcoin mention in favor for zcash
 #endif
 
 #if ENABLE_ZMQ