From c1f1baebb5170abb49fb0ec5d6d463d6827bae1b Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 29 Jan 2010 17:02:03 -0500
Subject: fix bad upstream merge

---
 examples/example.ldap | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'examples/example.ldap')

diff --git a/examples/example.ldap b/examples/example.ldap
index 4dd03ea..ee7c57d 100644
--- a/examples/example.ldap
+++ b/examples/example.ldap
@@ -48,5 +48,4 @@
 
 ## tls (default yes): if set to 'yes' then TLS connection will be
 ## attempted to your ldaphost by using the URI base ldaps: otherwise ldap: will be used
-# tls = yes
-
+# tls = yes
\ No newline at end of file
-- 
cgit v1.2.3