merge

2015-05-11 16:42:24 +08:00 · 2015-05-11 16:42:24 +08:00 · c7878b8b75
parent 4a8d194582
commit c7878b8b75
1 changed files with 0 additions and 11 deletions
--- a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
+++ b/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
@ -1,23 +1,12 @@
 {application, emqttd_auth_ldap,
 [
-<<<<<<< HEAD
  {description, "emqttd LDA Authentication Plugin"},
  {vsn, "1.0"},
-=======
-  {description, ""},
-  {vsn, "1"},
->>>>>>> c6e92388798302ae3b44286f444505d1c385aba7
  {registered, []},
  {applications, [
                  kernel,
                  stdlib
                 ]},
-<<<<<<< HEAD
-  {mod, {emqttd_auth_ldap_app, []}},
-  {env, []}
-]}.
-=======
  {mod, { emqttd_auth_ldap_app, []}},
  {env, []}
 ]}.
->>>>>>> c6e92388798302ae3b44286f444505d1c385aba7