yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Feng Lee 2015-05-11 16:42:24 +08:00
parent 4a8d194582
commit c7878b8b75
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
View File

@ -1,23 +1,12 @@
{application, emqttd_auth_ldap, {application, emqttd_auth_ldap,
[ [
<<<<<<< HEAD
{description, "emqttd LDA Authentication Plugin"}, {description, "emqttd LDA Authentication Plugin"},
{vsn, "1.0"}, {vsn, "1.0"},
=======
{description, ""},
{vsn, "1"},
>>>>>>> c6e92388798302ae3b44286f444505d1c385aba7
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,
stdlib stdlib
]}, ]},
<<<<<<< HEAD
{mod, {emqttd_auth_ldap_app, []}},
{env, []}
]}.
=======
{mod, { emqttd_auth_ldap_app, []}}, {mod, { emqttd_auth_ldap_app, []}},
{env, []} {env, []}
]}. ]}.
>>>>>>> c6e92388798302ae3b44286f444505d1c385aba7