changes from plugfest

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

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