fix(emqx_resource): merge conflict

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
 %%------------------------------------------------------------------------------