fix

2018-11-13 18:09:23 +08:00
parent d3f5fd5b3e
commit 2120ab4fd1
1 changed files with 0 additions and 4 deletions
--- a/src/cc/dice.cpp
+++ b/src/cc/dice.cpp
@@ -1425,12 +1425,8 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet
        return("");
    }
    if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) {
-<<<<<<< HEAD

        CCerror = "error in Diceinit";
-=======
-        CCerror = "Diceinit error in bet, is your transaction confirmed?";
->>>>>>> 08b2f80458cd1f0313af8089c9fda3b9a82ea68c
        return("");
    }
    if ( bet < minbet || bet > maxbet || odds > maxodds )