Don't do any merging if manageDSAit was used

[openldap] / servers / slapd / nt_svc.c

diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index ae759b924fbb4106766b86def13db47688477d2f..588e48a9f08de44a028efc739dbbd5fb6329d254 100644 (file)
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without