changes from plugfest

diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 50d9060fe15be5052c7bc73a4ff748181a216f51..3546287243987b602d3f942cc565f881c96644e2 100644 (file)
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@@ -23,22 +23,9 @@ argsfile    ./test-db/slapd.args
 # ldbm database definitions
 #######################################################################
 
-<<<<<<< slapd-schema.conf
 database       ldbm
-suffix         "o=OpenLDAP Project, l=Internet"
-=======
-database       @BACKEND@
 suffix         "o=OpenLDAP Project,l=Internet"
->>>>>>> 1.11
 directory      ./test-db
-<<<<<<< slapd-schema.conf
 dbnosync
 dbnolocking
-=======
 index          objectClass eq
-
-#database      @BACKEND@
-#suffix                "dc=example,dc=com"
-#directory     ./test-repl
-#index         objectClass eq
->>>>>>> 1.11

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index 4ba2be876e679182d405f06f7639da85b7cff117..94c60360b7c7f82c3eb547487edb63a8567113e9 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -23,15 +23,10 @@ rootpw              secret
 index          objectclass     eq
 index          uid     pres,eq,sub
 index          cn,sn   pres,eq,sub,subany
-<<<<<<< slapd.conf
 dbnosync
 dbnolocking
-=======
-#ldbm#dbnosync
-#ldbm#dbnolocking
 
-database       @BACKEND@
+database       ldbm
 suffix         "dc=OpenLDAP,dc=org"
 directory      ./test-repl
 index          objectclass     eq
->>>>>>> 1.11