Fixed type hints

benedikt-schesch · Sep 29, 2023 · 9a2e9a5 · 9a2e9a5
1 parent 5bb20c5
commit 9a2e9a5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/scripts/merge_tools/resolve-conflicts.py b/src/scripts/merge_tools/resolve-conflicts.py
@@ -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