all tests passing

This commit is contained in:
Manuel Araoz 2014-06-18 10:21:26 -03:00
commit b7af51ceee
3 changed files with 20 additions and 6 deletions

View file

@ -181,6 +181,7 @@ TxProposals.prototype.merge = function(inTxp) {
var v1 = inTxp;
ret = v0.merge(v1);
} else {
this.txps[ntxid] = inTxp;
ret.hasChanged = true;
ret.events.push({
type: 'new',