[fix] Bad merge!

Surprised that git seemed to silently merge badly? I don't see it any diffs?
oilshell · Jan 4, 2024 · 59c4a2c · 59c4a2c
1 parent 176f0a5
commit 59c4a2c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/frontend/lexer_def.py b/frontend/lexer_def.py
@@ -825,6 +825,7 @@ def R(pat, tok_type):
     C("u'", Id.Left_USingleQuote),
     C("b'", Id.Left_BSingleQuote),
     C("$'", Id.Left_DollarSingleQuote),
+    C('^"', Id.Left_CaretDoubleQuote),
     C('"""', Id.Left_TDoubleQuote),
     # In expression mode, we add the r'' and c'' prefixes for '' and $''.
     C("'''", Id.Left_TSingleQuote),