aboutsummaryrefslogtreecommitdiffstats
path: root/selinux/system_app.te
diff options
context:
space:
mode:
Diffstat (limited to 'selinux/system_app.te')
-rw-r--r--selinux/system_app.te4
1 files changed, 0 insertions, 4 deletions
diff --git a/selinux/system_app.te b/selinux/system_app.te
index ef29468..2e162b8 100644
--- a/selinux/system_app.te
+++ b/selinux/system_app.te
@@ -1,6 +1,2 @@
allow system_app log_device:chr_file write;
-<<<<<<< HEAD
-allow system_app sysfs:file write;
-=======
# allow system_app sysfs:file write;
->>>>>>> c4949ef... kona-common : update selinux 2