summaryrefslogtreecommitdiff
path: root/tests/test_using_api.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-04-14 13:03:29 -0400
committerTim Hatch <tim@timhatch.com>2014-04-14 13:03:29 -0400
commite0efb984487bb2e99bd2684689fee6ded477a478 (patch)
treebca99bafdaa9aa26b42a309157d973c253b49927 /tests/test_using_api.py
parentae6b1507776410421b97faf0054111e34526dcbc (diff)
parent68296591d500a2106c8fe2b7dccd144b58a2d6b7 (diff)
downloadpygments-e0efb984487bb2e99bd2684689fee6ded477a478.tar.gz
Merged in brodie/pygments (pull request #191)
Conflicts: pygments/lexers/jvm.py
Diffstat (limited to 'tests/test_using_api.py')
-rw-r--r--tests/test_using_api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_using_api.py b/tests/test_using_api.py
index bb89d1e2..9e53c206 100644
--- a/tests/test_using_api.py
+++ b/tests/test_using_api.py
@@ -3,7 +3,7 @@
Pygments tests for using()
~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""