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/git.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/git.profile')
| -rw-r--r-- | etc/git.profile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/git.profile b/etc/git.profile index 2fb55377d..73122d347 100644 --- a/etc/git.profile +++ b/etc/git.profile | |||
| @@ -12,15 +12,15 @@ include /etc/firejail/disable-common.inc | |||
| 12 | include /etc/firejail/disable-programs.inc | 12 | include /etc/firejail/disable-programs.inc |
| 13 | include /etc/firejail/disable-passwdmgr.inc | 13 | include /etc/firejail/disable-passwdmgr.inc |
| 14 | 14 | ||
| 15 | quiet | ||
| 16 | 15 | ||
| 17 | caps.drop all | 16 | caps.drop all |
| 18 | netfilter | 17 | netfilter |
| 18 | nogroups | ||
| 19 | nonewprivs | 19 | nonewprivs |
| 20 | noroot | 20 | noroot |
| 21 | nogroups | ||
| 22 | nosound | 21 | nosound |
| 23 | protocol unix,inet,inet6 | 22 | protocol unix,inet,inet6 |
| 23 | quiet | ||
| 24 | seccomp | 24 | seccomp |
| 25 | shell none | 25 | shell none |
| 26 | 26 | ||