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/vim.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/vim.profile')
| -rw-r--r-- | etc/vim.profile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/vim.profile b/etc/vim.profile index 3c1fefe41..b161fcbb0 100644 --- a/etc/vim.profile +++ b/etc/vim.profile | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | # vim profile | 1 | # vim profile |
| 2 | |||
| 3 | noblacklist ~/.vim | 2 | noblacklist ~/.vim |
| 4 | noblacklist ~/.vimrc | 3 | noblacklist ~/.vimrc |
| 5 | noblacklist ~/.viminfo | 4 | noblacklist ~/.viminfo |
| @@ -10,8 +9,8 @@ include /etc/firejail/disable-passwdmgr.inc | |||
| 10 | 9 | ||
| 11 | caps.drop all | 10 | caps.drop all |
| 12 | netfilter | 11 | netfilter |
| 12 | nogroups | ||
| 13 | nonewprivs | 13 | nonewprivs |
| 14 | noroot | 14 | noroot |
| 15 | nogroups | ||
| 16 | protocol unix,inet,inet6 | 15 | protocol unix,inet,inet6 |
| 17 | seccomp | 16 | seccomp |