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/mutt.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/mutt.profile')
| -rw-r--r-- | etc/mutt.profile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/mutt.profile b/etc/mutt.profile index cda7fc4bf..b532ded67 100644 --- a/etc/mutt.profile +++ b/etc/mutt.profile | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | noblacklist ~/.muttrc | 3 | noblacklist ~/.muttrc |
| 4 | noblacklist ~/.mutt | 4 | noblacklist ~/.mutt |
| 5 | noblacklist ~/.mutt/muttrc | ||
| 5 | noblacklist ~/.mailcap | 6 | noblacklist ~/.mailcap |
| 6 | noblacklist ~/.gnupg | 7 | noblacklist ~/.gnupg |
| 7 | noblacklist ~/.mail | 8 | noblacklist ~/.mail |