diff options
| author | Steve Spigarelli <spig@spig.net> | 2012-04-05 10:27:51 -0700 |
|---|---|---|
| committer | Steve Spigarelli <spig@spig.net> | 2012-04-05 10:27:51 -0700 |
| commit | b70d989a1b9c06b62e816a65675402f8c44ab363 (patch) | |
| tree | 4fdfc3c95932469e025c808affcee9dbcd47fbdb /pygments/lexers/_mapping.py | |
| parent | b3afc96f8ca2a05884f591ccd08c58b541f4103b (diff) | |
| parent | eb6a42b36927a23764f0df00af5ca607c6ac9498 (diff) | |
| download | pygments-b70d989a1b9c06b62e816a65675402f8c44ab363.tar.gz | |
fixed merge conflicts with web.py
Diffstat (limited to 'pygments/lexers/_mapping.py')
0 files changed, 0 insertions, 0 deletions