From 2120ab4fd111d67d655eb434dd9ce6b54bb4f90b Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Tue, 13 Nov 2018 18:09:23 +0800
Subject: [PATCH] fix

---
 src/cc/dice.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp
index 7ef00ad6c..81a141d3b 100644
--- 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 )