From cb576baef014e7abe141631e9bc8a377eb4c1e56 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Mon, 23 Feb 2015 17:18:35 -0300
Subject: [PATCH] rebase

---
 lib/client/api.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/client/api.js b/lib/client/api.js
index 2ddc878..ef4d4e6 100644
--- a/lib/client/api.js
+++ b/lib/client/api.js
@@ -588,10 +588,8 @@ API.prototype.parseTxProposals = function(txData, cb) {
   }, function(err, wcd) {
     if (err) return cb(err);
 
-    << << << < HEAD
     var txps = txData.txps;
-    _processTxps(txps, wcd.sharedEncryptingKey); === === =
-      _processTxps(txps, data.sharedEncryptingKey); >>> >>> > bit - history
+    _processTxps(txps, wcd.sharedEncryptingKey);
 
     var fake = _.any(txps, function(txp) {
       return (!Verifier.checkTxProposal(wcd, txp));