amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-09 05:25:26 +00:00
Code Issues Projects Releases Wiki Activity

Fixed merge

Browse Source 
Monotone-Parent: 24936b7a90184df1eebd3fa1c0df81c4dcbb2751
Monotone-Revision: f2612a8cd144efc05fbd0847e973f12e72643c9b

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-01-26T16:27:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2012-01-26 16:27:18 +00:00
parent 9ad7a6fa08
commit 68b99f2f28
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPSource.m
-4
View File
@@ -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;