From c7878b8b75b1ff1244f3c4342ce616b5930dde3d Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Mon, 11 May 2015 16:42:24 +0800
Subject: [PATCH] merge

---
 plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src b/plugins/emqttd_auth_ldap/src/emqttd_auth_ldap.app.src
index 970a0003c..eee513a0a 100644
--- 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