From ea3c8092873fcc10e04e1c5984197bc71ce2fe55 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Sun, 21 Nov 2021 00:58:14 +0800
Subject: [PATCH] fix(emqx_conf): merge issues

---
 apps/emqx_conf/src/emqx_conf.erl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl
index 733d9824f..c3dfa8c49 100644
--- a/apps/emqx_conf/src/emqx_conf.erl
+++ b/apps/emqx_conf/src/emqx_conf.erl
@@ -81,10 +81,7 @@ get_node_and_config(KeyPath) ->
     {ok, emqx_config:update_result()} | {error, emqx_config:update_error()}.
 update(KeyPath, UpdateReq, Opts0) ->
     Args = [KeyPath, UpdateReq, Opts0],
-    case multicall(emqx, update_config, Args) of
-        {ok, _TnxId, Res} -> Res;
-        {error, Res} -> Res
-    end.
+    multicall(emqx, update_config, Args).
 
 %% @doc Update the specified node's key path in local-override.conf.
 -spec update(node(), emqx_map_lib:config_key_path(), emqx_config:update_request(),