From 7a628e201f19531f6262ae88482e79134622314a Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Fri, 23 Jul 2021 18:20:45 +0800
Subject: [PATCH] fix(config): merge conflicts

---
 apps/emqx_statsd/src/emqx_statsd_api.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx_statsd/src/emqx_statsd_api.erl b/apps/emqx_statsd/src/emqx_statsd_api.erl
index 13391646a..ce3296ba5 100644
--- a/apps/emqx_statsd/src/emqx_statsd_api.erl
+++ b/apps/emqx_statsd/src/emqx_statsd_api.erl
@@ -92,7 +92,7 @@ statsd(put, Request) ->
     {ok, Body, _} = cowboy_req:read_body(Request),
     Params = emqx_json:decode(Body, [return_maps]),
     Enable = maps:get(<<"enable">>, Params),
-    ok = emqx_config:update_config([emqx_statsd], Params),
+    ok = emqx_config:update([emqx_statsd], Params),
     enable_statsd(Enable).
 
 enable_statsd(true) ->