#425: remove merge turd.

1 files changed, 0 insertions, 8 deletions

diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index 2677f965..e81a0c5d 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -427,19 +427,11 @@ class MakoLexer(RegexLexer):
             (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