Skip to content

Commit 48a4ac2

Browse files
committed
merge
1 parent ba6c233 commit 48a4ac2

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/tap/utils.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ def source_line_to_tokens(obj: object) -> Dict[int, List[Dict[str, Union[str, in
203203
"""Gets a dictionary mapping from line number to a dictionary of tokens on that line for an object's source code."""
204204
line_to_tokens = {}
205205
for token_type, token, (start_line, start_column), (end_line, end_column), line in tokenize_source(obj):
206-
<<<<<<< HEAD:tap/utils.py
207206
line_to_tokens.setdefault(start_line, []).append({
208207
'token_type': token_type,
209208
'token': bytes(token, encoding='ascii').decode('unicode-escape'),
@@ -213,19 +212,6 @@ def source_line_to_tokens(obj: object) -> Dict[int, List[Dict[str, Union[str, in
213212
'end_column': end_column,
214213
'line': line
215214
})
216-
=======
217-
line_to_tokens.setdefault(start_line, []).append(
218-
{
219-
"token_type": token_type,
220-
"token": token,
221-
"start_line": start_line,
222-
"start_column": start_column,
223-
"end_line": end_line,
224-
"end_column": end_column,
225-
"line": line,
226-
}
227-
)
228-
>>>>>>> main:src/tap/utils.py
229215

230216
return line_to_tokens
231217

0 commit comments

Comments
 (0)