Skip to content

Commit

Permalink
Import different Sequence
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Oct 2, 2023
1 parent f675263 commit 6c09014
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/scripts/merge_tools/resolve-conflicts.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
import sys
import tempfile

from typing import List, Union, Tuple, TypeVar
from collections.abc import Sequence
from typing import List, Union, Tuple, TypeVar, Sequence

T = TypeVar("T") # Type variable for use in type hints

Expand Down

0 comments on commit 6c09014

Please sign in to comment.