Merge branch 'dev' of https://github.com/jl777/komodo into jl777-dev

fix merge conflict
2018-09-19 13:46:01 +08:00
parent 0c0befd6c4 119f1c1e0c
commit 876a6e0f9b
9 changed files with 35 additions and 18 deletions
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -19,7 +19,7 @@
 #include "komodo_cJSON.h"

 //include "notaries_STAKED.h"
-
+//{"kmdcrazy", "02da444a2627d420f1f622fcdfb9bddb67d6d4241ad6b4d5054716ddbde8a25dfb"} // RJPJBbHcm5mkAxhkkERHRfEE9Cvkr4Euoi
 const char *notaries_STAKED[][2] =
 {
    {"blackjok3r", "021914947402d936a89fbdd1b12be49eb894a1568e5e17bb18c8a6cffbd3dc106e" }, // RTVti13NP4eeeZaCCmQxc2bnPdHxCJFP9x