More cleaning and updates in prep for 3.6.0

2020-12-16 23:20:06 -05:00
parent 97887c9166
commit 1a481f401c
48 changed files with 149 additions and 25 deletions
--- a/src/cc/CCMarmara.h
+++ b/src/cc/CCMarmara.h
@@ -20,8 +20,10 @@
 #ifndef CC_MARMARA_H
 #define CC_MARMARA_H

+/*
+
 #include "CCinclude.h"
-#include "../komodo_cJSON.h"
+#include "../hush_cJSON.h"

 #define MARMARA_GROUPSIZE 60
 #define MARMARA_MINLOCK (1440 * 3 * 30)
@@ -46,5 +48,6 @@ bool MarmaraValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t

 // CCcustom
 UniValue MarmaraInfo();
+*/

 #endif