git.samba.org
/
kamenim
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix merge errors on C provision interface after jelmer's good work.
[kamenim/samba.git]
/
source4
/
param
/
provision.h
diff --git
a/source4/param/provision.h
b/source4/param/provision.h
index 6b5bc798df0f771014257aead0c62e54bc464865..df955492728643e0275178c055bfd77da935f438 100644
(file)
--- a/
source4/param/provision.h
+++ b/
source4/param/provision.h
@@
-21,7
+21,6
@@
#define _PROVISION_H_
struct provision_settings {
- const char *dns_name;
const char *site_name;
const char *root_dn_str;
const char *domain_dn_str;