From ed68a48665298e491a373e6af3d1b518c547f0c9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 18 Sep 2016 06:30:43 -0300 Subject: [PATCH] test --- iguana/iguana_unspents.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index 2dbf20860..44bef6db7 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -382,11 +382,7 @@ int32_t iguana_uheight(struct iguana_info *coin,int32_t bundleheight,struct igua int32_t iguana_outpt_set(struct iguana_info *coin,struct iguana_outpoint *outpt,struct iguana_unspent *u,uint32_t unspentind,int16_t hdrsi,bits256 txid,int32_t vout,uint8_t *rmd160,uint8_t *pubkey33) { -<<<<<<< HEAD - char scriptstr[IGUANA_MAXSCRIPTSIZE*2+1],asmstr[16384]; -======= char scriptstr[IGUANA_MAXSCRIPTSIZE*2+1],asmstr[16384]; ->>>>>>> master memset(outpt,0,sizeof(*outpt)); outpt->txid = txid; outpt->vout = vout;