Merge conflict artifact in pygments.lexers.templates.MakoLexer

Issue #425 resolved
Anonymous created an issue

Hello! There's diff3-ish output around [http://dev.pocoo.org/projects/pygments/browser/pygments/lexers/templates.py#L430 line 430], introduced by r733.

Reported by hlian