Fix mismerge
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:53:12 +0000 (16:53 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:53:12 +0000 (16:53 +0200)
commit65ca7b983d12caf81abb19d23bff069bbcca33c7
tree7eea7bf7f1225fa614ba28cfa1b86b3c5b1ad530
parentc7e69e8e13056f062188162bb4468d33c713f897
Fix mismerge
src/openldap.c