From 16c0a5b80a22bf4b9037b8726317847276e1f78d Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 7 Jun 2021 21:25:19 +0800
Subject: [PATCH] fix(emqx_resource): merge conflict

---
 apps/emqx_resource/src/emqx_resource_instance.erl | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl
index d2f4dbbfa..1e924e249 100644
--- a/apps/emqx_resource/src/emqx_resource_instance.erl
+++ b/apps/emqx_resource/src/emqx_resource_instance.erl
@@ -100,16 +100,6 @@ save_config_to_disk(InstId, ResourceType, Config) ->
 emqx_data_dir() ->
     "data".
 
-save_config_to_disk(InstId, ResourceType, Config) ->
-    %% TODO: send an event to the config handler, and the hander (single process)
-    %% will dump configs for all instances (from an ETS table) to a file.
-    file:write_file(filename:join([emqx_data_dir(), binary_to_list(InstId) ++ ".conf"]),
-        jsx:encode(#{id => InstId, resource_type => ResourceType,
-                     config => emqx_resource:call_jsonify(ResourceType, Config)})).
-
-emqx_data_dir() ->
-    "data".
-
 %%------------------------------------------------------------------------------
 %% gen_server callbacks
 %%------------------------------------------------------------------------------