From a9bbac3424330a3b80f1dd42954ccd5aba7b7f48 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 24 Aug 2018 00:40:48 -1100
Subject: [PATCH] Sync to jl777 branch

---
 src/cc/CCinclude.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 406d22fb2..184466fa4 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -49,10 +49,7 @@ one other technical note is that komodod has the insight-explorer extensions bui
 #include <exception>
 
 extern int32_t KOMODO_CONNECTING,KOMODO_CCACTIVATE;
-<<<<<<< HEAD
 extern uint32_t ASSETCHAINS_CC;
-=======
->>>>>>> jl777
 
 #define SMALLVAL 0.000000000000001
 union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };