diff options
author | Jeffrey B. Arnold <jeffrey.arnold@gmail.com> | 2012-09-02 06:18:24 -0400 |
---|---|---|
committer | Jeffrey B. Arnold <jeffrey.arnold@gmail.com> | 2012-09-02 06:18:24 -0400 |
commit | 0c363d7084ebd5b246c6d11e3494a3e481e91b2c (patch) | |
tree | db247976979fda99925531d0fc48930bc49eb3bf /AUTHORS | |
parent | c216140e347feefc7ef14776fd2b0fe32740756c (diff) | |
parent | 7c371dd21127e55cbbee5daf955a0974115fc65a (diff) | |
download | pygments-0c363d7084ebd5b246c6d11e3494a3e481e91b2c.tar.gz |
resolved conflict
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -44,6 +44,7 @@ Other contributors, listed alphabetically, are: * Matthew Harrison -- SVG formatter * Steven Hazel -- Tcl lexer * Aslak Hellesøy -- Gherkin lexer +* Greg Hendershott -- Racket lexer * Jordi Gutiérrez Hermoso -- Octave lexer * David Hess, Fish Software, Inc. -- Objective-J lexer * Varun Hiremath -- Debian control lexer |