From bdeeaa4978d7394cbfbdda3ee0c6fb6e21bd73be Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 16 Apr 2018 08:29:21 +0300
Subject: [PATCH] Test

---
 src/komodo_globals.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index d3a95c6cc..865f377e2 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -47,10 +47,6 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100;
 
 int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,KOMODO_PASSPORT_INITDONE,KOMODO_PAX,KOMODO_EXCHANGEWALLET,KOMODO_REWIND;
 int32_t KOMODO_LASTMINED,prevKOMODO_LASTMINED,JUMBLR_PAUSE;
-<<<<<<< HEAD
-uint32_t ASSETCHAINS_CC;
-=======
->>>>>>> dev
 std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY;
 uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33];