Sync to jl777 branch

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; };