Anonymous avatar Anonymous committed 04427c6

#425: remove merge turd.

Comments (0)

Files changed (1)

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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.