From 6578fd874283ee97c2896bcf7257db7f3e37c2ec Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 11 Apr 2001 23:19:08 +0000
Subject: To stop people complaining about the mktemp call, move it into
 lib/util.c. Thanks to Andrew for all this code. Fixed extra line in
 lib/sysacls.c that broke XFS ACL code. Jeremy. (This used to be commit
 9b32b8a8cfc8ddb93c14d5581f433d2e93f89ed2)

---
 source3/lib/sysacls.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source3/lib/sysacls.c')

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 778f467c12b..59f8e2e043f 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)
-- 
cgit