diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-10 20:59:17 +0200 |
| commit | 6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch) | |
| tree | 9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/dsdb | |
| parent | 640792fb5841ef03e83e59d8d74d65b6f7203756 (diff) | |
| download | samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.gz samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.tar.bz2 samba-6267dd78539863a5ec75b6cadba39184a2efc9b5.zip | |
Clean up some git merges gone wrong.
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 4 |
1 files changed, 0 insertions, 4 deletions
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 ################################################ |