Added noqa

benedikt-schesch · May 19, 2024 · ef3f926 · ef3f926
1 parent 1a00b64
commit ef3f926
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/scripts/merge_tools/resolve-conflicts.py b/src/scripts/merge_tools/resolve-conflicts.py
@@ -296,7 +296,7 @@ def merge_base_is_prefix_or_suffix(
     """
     base_len = len(base)
     parent1_len = len(parent1)
-    parent2_len = len(parent2)
+    parent2_len = len(parent2)  # noqa: F841
     if base_len < parent1_len:
         if parent1[:base_len] == base:
             debug_print("startswith", parent1, base)