Commits

gbrandl  committed 04427c6

#425: remove merge turd.

  • Participants
  • Parent commits c9b4344
  • Branches trunk

Comments (0)

Files changed (1)

File pygments/lexers/templates.py

             (r'''(?sx)
                 (.+?)                # anything, followed by:
                 (?:
-<<<<<<< local
-                 (?<=\n)(?=%|\#\#) |# an eval or comment line
-                 (?=\#\*) |         # multiline comment
-                 (?=</?%) |         # a python block
-                                    # call start or end
-                 (?=\$\{) |         # a substitution
-=======
                  (?<=\n)(?=%|\#\#) | # an eval or comment line
                  (?=\#\*) |          # multiline comment
                  (?=</?%) |          # a python block
                                      # call start or end
                  (?=\$\{) |          # a substitution
->>>>>>> other
                  (?<=\n)(?=\s*%) |
                                      # - don't consume
                  (\\\n) |            # an escaped newline