diff options
| author |  glitsj16 <glitsj16@users.noreply.github.com> | 2021-01-30 00:37:01 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-01-30 00:37:01 +0000 |
| commit | dbd8925fd98036647db04dcf902f5585752c8289 (patch) | |
| tree | d337d510897cf1c2dc19f246e68e952d2c765af4 /etc/profile-m-z/meld.profile | |
| parent | Fix #3925 -- telegram-desktop launch browser for … (diff) | |
| parent | disable-common.inc: add missing openssh paths (diff) | |
| download | firejail-dbd8925fd98036647db04dcf902f5585752c8289.tar.gz firejail-dbd8925fd98036647db04dcf902f5585752c8289.tar.zst firejail-dbd8925fd98036647db04dcf902f5585752c8289.zip | |
Merge pull request #3885 from kmk3/fix-ssh
ssh: Refactor, fix bugs & harden
Diffstat (limited to 'etc/profile-m-z/meld.profile')
| -rw-r--r-- | etc/profile-m-z/meld.profile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/profile-m-z/meld.profile b/etc/profile-m-z/meld.profile index 1a68cd37d..d76522fce 100644 --- a/etc/profile-m-z/meld.profile +++ b/etc/profile-m-z/meld.profile | |||
| @@ -18,7 +18,6 @@ noblacklist ${HOME}/.config/git | |||
| 18 | noblacklist ${HOME}/.gitconfig | 18 | noblacklist ${HOME}/.gitconfig |
| 19 | noblacklist ${HOME}/.git-credentials | 19 | noblacklist ${HOME}/.git-credentials |
| 20 | noblacklist ${HOME}/.local/share/meld | 20 | noblacklist ${HOME}/.local/share/meld |
| 21 | noblacklist ${HOME}/.ssh | ||
| 22 | noblacklist ${HOME}/.subversion | 21 | noblacklist ${HOME}/.subversion |
| 23 | 22 | ||
| 24 | # Allow python (blacklisted by disable-interpreters.inc) | 23 | # Allow python (blacklisted by disable-interpreters.inc) |
| @@ -26,6 +25,9 @@ noblacklist ${HOME}/.subversion | |||
| 26 | #include allow-python2.inc | 25 | #include allow-python2.inc |
| 27 | include allow-python3.inc | 26 | include allow-python3.inc |
| 28 | 27 | ||
| 28 | # Allow ssh (blacklisted by disable-common.inc) | ||
| 29 | include allow-ssh.inc | ||
| 30 | |||
| 29 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. | 31 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. |
| 30 | #include disable-common.inc | 32 | #include disable-common.inc |
| 31 | include disable-devel.inc | 33 | include disable-devel.inc |