summaryrefslogtreecommitdiff
path: root/source3/lib/sysacls.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib/sysacls.c')
-rw-r--r--source3/lib/sysacls.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 778f467c12..59f8e2e043 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -1221,7 +1221,6 @@ int sys_acl_free_acl(SMB_ACL_T the_acl)
return acl_free(the_acl);
}
->>>>>>> 1.15
#else /* No ACLs. */
int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)