From 9a2e9a566a7604f6cd9bfb02ffdc19dec8fcc569 Mon Sep 17 00:00:00 2001
From: Benedikt schesch <b.schesch@gmail.com>
Date: Fri, 29 Sep 2023 14:58:39 -0700
Subject: [PATCH] Fixed type hints

---
 src/scripts/merge_tools/resolve-conflicts.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/scripts/merge_tools/resolve-conflicts.py b/src/scripts/merge_tools/resolve-conflicts.py
index bb81a293b3..cbc0aab030 100755
--- 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