christos 956cbeb4ba merge conflicts		2020-08-11 13:15:33 +00:00
..
bin
dist	merge conflicts	2020-08-11 13:15:33 +00:00
include	merge conflicts	2020-08-11 13:15:33 +00:00
lib
man	merge conflicts	2020-08-11 13:15:33 +00:00
Makefile	merge conflicts	2020-08-11 13:15:33 +00:00
openldap2netbsd	merge conflicts	2020-08-11 13:15:33 +00:00
openldap.mk
TODO