diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2020-01-07 21:10:52 +0100 |
| commit | c7751058ec70e380fa57b7a8db102c1a8a37c25c (patch) | |
| tree | e1097d74aedbe4aef48f9fdcab0c3b74ce48ae9f /pygments/styles/inkpot.py | |
| parent | d55d8be8da86fb5a273263375fab90993ddb7e9e (diff) | |
| parent | 4f8b0b66ebb7ea5695441d5a97ac836b75e97e7a (diff) | |
| download | pygments-git-c7751058ec70e380fa57b7a8db102c1a8a37c25c.tar.gz | |
Merge branch 'master' into 671/upsuper/webidl
This allows us to resolve the merge conflict properly.
Diffstat (limited to 'pygments/styles/inkpot.py')
| -rw-r--r-- | pygments/styles/inkpot.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pygments/styles/inkpot.py b/pygments/styles/inkpot.py index a030b8b1..0b7ea74e 100644 --- a/pygments/styles/inkpot.py +++ b/pygments/styles/inkpot.py @@ -5,14 +5,13 @@ A highlighting style for Pygments, inspired by the Inkpot theme for VIM. - :copyright: Copyright 2018 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ from pygments.style import Style -from pygments.token import Text, Other, \ - Keyword, Name, Comment, String, Error, \ - Number, Operator, Generic, Whitespace, Punctuation +from pygments.token import Text, Other, Keyword, Name, Comment, String, \ + Error, Number, Operator, Generic, Whitespace, Punctuation class InkPotStyle(Style): |