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/librpc | |
| 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/librpc')
| -rw-r--r-- | source4/librpc/config.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 11f5acb39c..42da797054 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -782,8 +782,6 @@ PRIVATE_DEPENDENCIES = RPC_NDR_DFS PYTALLOC python_dfs_OBJ_FILES = librpc/gen_ndr/py_dfs.o -python_dfs_OBJ_FILES = gen_ndr/py_dfs.o - [PYTHON::python_unixinfo] PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC @@ -794,8 +792,6 @@ PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI PYTALLOC python_drsuapi_OBJ_FILES = librpc/gen_ndr/py_drsuapi.o -python_drsuapi_OBJ_FILES = gen_ndr/py_drsuapi.o - [PYTHON::python_dcerpc_security] PRIVATE_DEPENDENCIES = PYTALLOC |