Clean up some git merges gone wrong.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 18:59:17 +0000 (20:59 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 May 2008 18:59:17 +0000 (20:59 +0200)
commit6267dd78539863a5ec75b6cadba39184a2efc9b5
tree9843465f180c8b0c3ade9701dd9cf7e1afd96eae
parent640792fb5841ef03e83e59d8d74d65b6f7203756
Clean up some git merges gone wrong.
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
source4/auth/ntlm/auth.c
source4/build/smb_build/config_mk.pm
source4/build/smb_build/main.pl
source4/build/smb_build/makefile.pm
source4/dsdb/samdb/ldb_modules/config.mk
source4/librpc/config.mk
source4/scripting/python/modules.c