Skip to content

Commit 5718281

Browse files
Merge branch 'multiline-exprs' into more-robust-whitespace-reconstruction
2 parents a3bc62c + c9a10d9 commit 5718281

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

hcl2/postlexer.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
add new passes without touching existing logic.
66
"""
77

8+
<<<<<<< more-robust-whitespace-reconstruction
89
from collections.abc import Iterator
910
from typing import FrozenSet, Optional, Tuple
11+
=======
12+
from typing import FrozenSet, Iterator, Optional, Tuple
13+
>>>>>>> multiline-exprs
1014

1115
from lark import Token
1216

0 commit comments

Comments
 (0)