diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-25 12:49:37 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-25 12:49:37 +0100 |
commit | 258ae4cec596631b758fb17c170c4494e4db8a8e (patch) | |
tree | 5c9ef9246eef3af3b744e862d0e5314a4686304e /source3/include/includes.h | |
parent | fff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (diff) | |
parent | a041d9061922b1a90e5b5047af77934d908afdd5 (diff) | |
download | samba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.gz samba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.bz2 samba-258ae4cec596631b758fb17c170c4494e4db8a8e.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
source4/scripting/python/samba/provision.py
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r-- | source3/include/includes.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 5ab5564e47..80d7bfc6cf 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -677,8 +677,6 @@ struct printjob; #include "smbldap.h" -#include "smb_ldap.h" - /* * Reasons for cache flush. */ |