diff options
| author |  KOLANICH <kolan_n@mail.ru> | 2020-01-31 12:25:04 +0300 |
|---|---|---|
| committer |  Vincent43 <31109921+Vincent43@users.noreply.github.com> | 2020-02-07 20:02:43 +0000 |
| commit | d7bca1137c91b654df4300f4ad20f45c8d191598 (patch) | |
| tree | 067dc81d05a391043f7bfa10fa72226873fbd6f5 /etc | |
| parent | revert #3178 (diff) | |
| download | firejail-d7bca1137c91b654df4300f4ad20f45c8d191598.tar.gz firejail-d7bca1137c91b654df4300f4ad20f45c8d191598.tar.zst firejail-d7bca1137c91b654df4300f4ad20f45c8d191598.zip | |
Fixing the bug in 189772034b211578aca59540d7277f45da4f45d2 breaking meld
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/meld.profile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/meld.profile b/etc/meld.profile index f360b1ded..9a320c13d 100644 --- a/etc/meld.profile +++ b/etc/meld.profile | |||
| @@ -22,8 +22,10 @@ noblacklist ${HOME}/.ssh | |||
| 22 | noblacklist ${HOME}/.subversion | 22 | noblacklist ${HOME}/.subversion |
| 23 | 23 | ||
| 24 | # Allow python (blacklisted by disable-interpreters.inc) | 24 | # Allow python (blacklisted by disable-interpreters.inc) |
| 25 | include allow-python3.inc | ||
| 26 | |||
| 25 | # Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions. | 27 | # Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions. |
| 26 | #include allow-python3.inc | 28 | #include allow-python2.inc |
| 27 | 29 | ||
| 28 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. | 30 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. |
| 29 | #include disable-common.inc | 31 | #include disable-common.inc |