From 8479f91a3f90daa619b3613d82b5d10728405e72 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 30 Oct 2000 17:14:43 +0000
Subject: [PATCH] Fix last commit
---
doc/man/man5/slapd.conf.5 | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 7da9741245..b0843ea5fe 100644
--- 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
--
GitLab