From 6267dd78539863a5ec75b6cadba39184a2efc9b5 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 10 May 2008 20:59:17 +0200
Subject: Clean up some git merges gone wrong. (This used to be commit
 42eb6b33462228467e65a51bbf624c481802b090)

---
 source4/dsdb/samdb/ldb_modules/config.mk | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source4/dsdb')

diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index 69bfa14da0..5161d0fcf8 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -4,11 +4,7 @@
 SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
-<<<<<<< HEAD:source/dsdb/samdb/ldb_modules/config.mk
 INIT_FUNCTION = LDB_MODULE(objectguid)
-=======
-INIT_FUNCTION = objectguid_module_module_ops
->>>>>>> 5f3a70f285ad8a412105c0e498e486f93fc279bc:source/dsdb/samdb/ldb_modules/config.mk
 # End MODULE ldb_objectguid
 ################################################
 
-- 
cgit