diff options
author | valoq <valoq@mailbox.org> | 2016-10-26 17:51:07 +0200 |
---|---|---|
committer | valoq <valoq@mailbox.org> | 2016-10-26 17:51:07 +0200 |
commit | ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4 (patch) | |
tree | 0e35dd6dc35f3c8d5ea32a6c076e270524b3db36 /etc/less.profile | |
parent | removed blacklist duplate (diff) | |
parent | removed ping blacklisting (diff) | |
download | firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.tar.gz firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.tar.zst firejail-ad773dec65ec32e0fcba1b123b3da5b9edcbf9d4.zip |
resolve conflict
Diffstat (limited to 'etc/less.profile')
-rw-r--r-- | etc/less.profile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/less.profile b/etc/less.profile index 6dfae027e..08758aead 100644 --- a/etc/less.profile +++ b/etc/less.profile | |||
@@ -2,8 +2,10 @@ | |||
2 | quiet | 2 | quiet |
3 | ignore noroot | 3 | ignore noroot |
4 | include /etc/firejail/default.profile | 4 | include /etc/firejail/default.profile |
5 | tracelog | 5 | |
6 | net none | 6 | net none |
7 | nosound | ||
7 | shell none | 8 | shell none |
9 | tracelog | ||
10 | |||
8 | private-dev | 11 | private-dev |
9 | nosound | ||