From 6c0cf836103f6f60b8979bda7b3513b926778513 Mon Sep 17 00:00:00 2001
From: Benedikt schesch <b.schesch@gmail.com>
Date: Mon, 25 Sep 2023 21:38:54 -0700
Subject: [PATCH] Style Fix

---
 src/scripts/merge_tools/resolve-import-conflicts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/scripts/merge_tools/resolve-import-conflicts b/src/scripts/merge_tools/resolve-import-conflicts
index fa6c1d4726..fc4605f54a 100755
--- a/src/scripts/merge_tools/resolve-import-conflicts
+++ b/src/scripts/merge_tools/resolve-import-conflicts
@@ -21,8 +21,6 @@ fi
 
 SCRIPTDIR="$(cd "$(dirname "$0")" && pwd -P)"
 
-status=0
-
 for file in "${files[@]}" ; do
   if ! "${SCRIPTDIR}"/resolve-import-conflicts-in-file.py "$file" ; then
     echo "Error in $file"