Skip to content

Commit

Permalink
Style Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed Sep 26, 2023
1 parent 6313cb0 commit 6c0cf83
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/scripts/merge_tools/resolve-import-conflicts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 6c0cf83

Please sign in to comment.