diff options
| author |  glitsj16 <glitsj16@users.noreply.github.com> | 2020-01-27 16:31:30 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-01-27 16:31:30 +0000 |
| commit | 189772034b211578aca59540d7277f45da4f45d2 (patch) | |
| tree | 00126b9fad2c8c1cc01c6ca460410b79299fab20 | |
| parent | Update whois.profile (#3154) (diff) | |
| download | firejail-189772034b211578aca59540d7277f45da4f45d2.tar.gz firejail-189772034b211578aca59540d7277f45da4f45d2.tar.zst firejail-189772034b211578aca59540d7277f45da4f45d2.zip | |
clarify dropping python2 support in meld.profile (#3167)
* clarify dropping python2 support in meld.profile
* properly comment the python2 situation in meld
| -rw-r--r-- | etc/meld.profile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/meld.profile b/etc/meld.profile index dc4246611..f360b1ded 100644 --- a/etc/meld.profile +++ b/etc/meld.profile | |||
| @@ -22,7 +22,8 @@ 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 | 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. |
| 26 | #include allow-python3.inc | ||
| 26 | 27 | ||
| 27 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. | 28 | # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc. |
| 28 | #include disable-common.inc | 29 | #include disable-common.inc |