fix

8 years ago · 28ad1e17fc
1 changed files with 0 additions and 5 deletions
--- a/iguana/iguana_sign.c
+++ b/iguana/iguana_sign.c
@ -273,11 +273,6 @@ int32_t iguana_parsevinobj(struct supernet_info *myinfo,struct iguana_info *coin
    {
        if ( vin->vinscript == 0 )
        {
-<<<<<<< HEAD
-            //printf("null vinscript case\n");
-=======
-            //printf("null vinscript case -> need to sign this tx\n");
->>>>>>> master
            vin->vinscript = serialized;
            vin->vinscript[0] = 0;
            vin->scriptlen = 1;