From 2a4b054ba129fe462a930056e19026f269197d68 Mon Sep 17 00:00:00 2001
From: Matias Pando <mpando@bitpay.com>
Date: Thu, 11 Sep 2014 11:30:55 -0300
Subject: [PATCH] Solving conflicts

---
 test/test.Wallet.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index 983cfc076..e55128119 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -829,23 +829,6 @@ describe('Wallet model', function() {
     });
   });
 
-  describe('#createTxSync', function() {
-    it('should fail if amount below min value', function() {
-      var w = cachedCreateW2();
-      var utxo = createUTXO(w);
-
-      var badCreate = function() {
-        w.createTxSync(
-          'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
-          '123',
-          null,
-          utxo
-        );
-      }
-      chai.expect(badCreate).to.throw('invalid amount');
-    });
-  });
-
   describe('removeTxWithSpentInputs', function() {
     it('should remove pending TxProposal with spent inputs', function(done) {
       var w = cachedCreateW2();