Fix Conflicting files

2017-07-23 21:23:47 +08:00 · 2017-07-23 21:23:47 +08:00 · d57fa1a2bb
parent 74145cf5df 0537351eed
commit d57fa1a2bb
1 changed files with 1 additions and 1 deletions
--- a/src/emqttd_app.erl
+++ b/src/emqttd_app.erl
@ -151,7 +151,7 @@ register_acl_mod() ->
 start_autocluster() ->
    ekka:callback(prepare, fun emqttd:shutdown/1),
    ekka:callback(reboot,  fun emqttd:reboot/0),
-    ekka:autocluster(fun after_autocluster/0).
+    ekka:autocluster(?APP, fun after_autocluster/0).

 after_autocluster() ->
    emqttd_plugins:init(),