diff options
| author | Enrique Zamudio <alterbass@gmail.com> | 2012-09-26 13:43:55 -0500 |
|---|---|---|
| committer | Enrique Zamudio <alterbass@gmail.com> | 2012-09-26 13:43:55 -0500 |
| commit | 0f91e6b804cf8b6400819f854e5a47e1e38b9beb (patch) | |
| tree | 2f939ca7a0fce435ba07459fa6b30973e7c4bed2 | |
| parent | 30465b72fd88ac91d9c0ec851737be9334ff5402 (diff) | |
| download | pygments-0f91e6b804cf8b6400819f854e5a47e1e38b9beb.tar.gz | |
avoid conflict
| -rw-r--r-- | pygments/lexers/jvm.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index 3860ac47..25b33427 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -20,7 +20,8 @@ from pygments import unistring as uni __all__ = ['JavaLexer', 'ScalaLexer', 'GosuLexer', 'GosuTemplateLexer', - 'GroovyLexer', 'IokeLexer', 'ClojureLexer', 'KotlinLexer', 'CeylonLexer'] + 'GroovyLexer', 'IokeLexer', 'ClojureLexer', 'KotlinLexer', + 'CeylonLexer'] class JavaLexer(RegexLexer): |