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"