Remove duplicates

[novacoin.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 0a9a663..e753d4d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -140,11 +140,6 @@ bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsig
 
 
 
-
-
-
-bool GetWalletFile(CWallet* pwallet, std::string &strWalletFileOut);
-
 /** Position on disk for a particular transaction. */
 class CDiskTxPos
 {
@@ -794,7 +789,7 @@ public:
     )
 
 
-    int SetMerkleBranch(const CBlock* pblock);
+    int SetMerkleBranch(const CBlock* pblock=NULL);
     int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
     int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
     bool IsInMainChain() const { return GetDepthInMainChain() > 0; }