Remove MERGE comments from patch

2011-04-19 11:41:58 -04:00 · 2011-04-19 11:41:58 -04:00 · fa7479b56f
parent bd16f8dd70
commit fa7479b56f
1 changed files with 0 additions and 13 deletions
--- a/policy-F16.patch
+++ b/policy-F16.patch
@ -30728,19 +30728,6 @@ index 604f67b..f5de0a2 100644
 
 	kerberos_read_keytab($2)
 	kerberos_use($2)
-@@ -289,6 +307,12 @@ interface(`kerberos_manage_host_rcache',`
- 
- 		seutil_read_file_contexts($1)
- 
-+<<<<<<< HEAD
-+		files_rw_tmp_dirs($1)
-+||||||| merged common ancestors
-+=======
-+		files_rw_generic_tmp_dir($1)
-+>>>>>>> fc09d81ec7c51e42fe3d0ce894bc530645f46456
- 		allow $1 krb5_host_rcache_t:file manage_file_perms;
- 		files_search_tmp($1)
- 	')
@@ -296,28 +320,6 @@ interface(`kerberos_manage_host_rcache',`
 
 ########################################