summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-10 20:59:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-10 20:59:17 +0200
commit6267dd78539863a5ec75b6cadba39184a2efc9b5 (patch)
tree9843465f180c8b0c3ade9701dd9cf7e1afd96eae /source4/scripting/python
parent640792fb5841ef03e83e59d8d74d65b6f7203756 (diff)
downloadsamba-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/scripting/python')
-rw-r--r--source4/scripting/python/modules.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index cbff14c708..0fe15b2fda 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -39,12 +39,10 @@ extern void initdrsuapi(void);
extern void initwinreg(void);
extern void initepmapper(void);
extern void initinitshutdown(void);
-static void initdcerpc_misc(void) {}
extern void initmgmt(void);
extern void initnet(void);
extern void initatsvc(void);
extern void initsamr(void);
-static void initdcerpc_security(void) {}
extern void initlsa(void);
extern void initsvcctl(void);
extern void initwkssvc(void);