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/telegram.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/telegram.profile')
-rw-r--r-- | etc/telegram.profile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/etc/telegram.profile b/etc/telegram.profile index 8e91e426b..7615c8eef 100644 --- a/etc/telegram.profile +++ b/etc/telegram.profile | |||
@@ -10,4 +10,3 @@ nonewprivs | |||
10 | noroot | 10 | noroot |
11 | protocol unix,inet,inet6 | 11 | protocol unix,inet,inet6 |
12 | seccomp | 12 | seccomp |
13 | |||