From 68b99f2f28fe8b1cc327b8b53f4452870426b1cd Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 26 Jan 2012 16:27:18 +0000
Subject: [PATCH] Fixed merge

Monotone-Parent: 24936b7a90184df1eebd3fa1c0df81c4dcbb2751
Monotone-Revision: f2612a8cd144efc05fbd0847e973f12e72643c9b

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-01-26T16:27:18
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/SOGo/LDAPSource.m | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 3cedeef52..fa2db52bf 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -166,12 +166,8 @@ static Class NSStringK;
       bindFields = nil;
       _scope = @"sub";
       _filter = nil;
-<<<<<<< variant A
 	  _userPasswordAlgorithm = nil;
->>>>>>> variant B
       listRequiresDot = YES;
-####### Ancestor
-======= end
 
       searchAttributes = nil;
       passwordPolicy = NO;