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)
commit42eb6b33462228467e65a51bbf624c481802b090
tree21ca1012d9ec1dfc44dba9fb9a362fcfcd618ca6
parentcca75ae22d225dda2e96907daa3c24a35bb281cd
Clean up some git merges gone wrong.
source/auth/ntlm/auth.c
source/build/smb_build/config_mk.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/samdb/ldb_modules/config.mk
source/librpc/config.mk
source/scripting/python/modules.c