electrum

commit 960407925a19104bb2bfa86dd3a05eeb745f0dea
parent 312051a242cda4b661e5a93f896c7db693d97d2c
Author: ThomasV <thomasv@gitorious>
Date:   Mon, 28 Jul 2014 15:49:51 +0200

Merge branch 'master' of git://github.com/spesmilo/electrum

Diffstat:
M
scripts/merchant/merchant.py
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
@@ -167,7 +167,7 @@ if __name__ == '__main__':
     wallet = Wallet(storage)
     if not storage.file_exists:
         wallet.seed = ''
-        wallet.create_watching_only_wallet(master_public_key,master_chain)
+        wallet.create_watching_only_wallet(master_public_key)
 
     wallet.synchronize = lambda: None # prevent address creation by the wallet
     wallet.start_threads(network)