Fix last commit

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 7da974124504bcc6b16dbe8d8e484c1bc9c0419f..b0843ea5fe5d4442877d6da9a460cb319f407474 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -121,8 +121,7 @@ SubstringAssertion NISnetgrouptriple Bootparameter
 .TP
 .B concurrency <integer>
 Specify a desired level of concurrency.  Provided to the underlying
-<<<<<<< slapd.conf.5
-thread system as a hint.  The default is not to provdide any hint.
+thread system as a hint.  The default is not to provide any hint.
 .HP
 .B defaultaccess { none | auth | compare | search | read | write }
 .RS
@@ -133,9 +132,6 @@ recommended that
 .B access
 directives be used instead.
 .RE
-=======
-thread system as a hint.  The default is not to provide any hint.
->>>>>>> 1.57
 .TP
 .B defaultsearchbase <dn>
 Specify a default search base to use when client submits a