From 888f69d13aba3eb21268a5c52ae66ec4e45dc0cb Mon Sep 17 00:00:00 2001
From: Olzhas <oljas.jarasbaev@demlabs.net>
Date: Wed, 23 Oct 2024 14:22:37 +0700
Subject: [PATCH] [*] merge master
---
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index d828ccc809..80b293580f 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -3086,11 +3086,7 @@ static int s_cli_esbocs(int a_argc, char **a_argv, void **a_str_reply)
} else if (dap_cli_server_cmd_check_option(a_argv, l_arg_index, l_arg_index + 1, "show") > 0)
l_subcommand_show = true;
else if (l_subcmd != SUBCMD_STATUS)
-<<<<<<< HEAD
- dap_json_rpc_error_add(DAP_CHAIN_NODE_CLI_COM_ESBOCS_UNKNOWN,"Unrecognized subcommand '%s'", a_argv[l_arg_index]);
-=======
dap_json_rpc_error_add(*a_json_arr_reply, DAP_CHAIN_NODE_CLI_COM_ESBOCS_UNKNOWN,"Unrecognized subcommand '%s'", a_argv[l_arg_index]);
->>>>>>> 88c36792da33c1c2c7e7c7d332fd4918b7ae83e3
}
int ret = 0;
@@ -3188,7 +3184,7 @@ static int s_cli_esbocs(int a_argc, char **a_argv, void **a_str_reply)
} else{
json_object * json_obj_out = json_object_new_object();
s_print_emergency_validators(json_obj_out, l_esbocs_pvt->emergency_validator_addrs);
- json_object_array_add(*json_arr_reply, json_obj_out);
+ json_object_array_add(*a_json_arr_reply, json_obj_out);
}
} break;
--
GitLab