Style fix

benedikt-schesch · May 21, 2024 · 2f908b2 · 2f908b2
1 parent 2290887
commit 2f908b2
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh
@@ -37,8 +37,6 @@ java -jar "$intellimerge_absolutepath" -r "$clone_dir" -b "$branch1" "$branch2"
 cd "$clone_dir" || exit 1
 git checkout "$branch1" --force
 
-initial_conflict_markers=$(grep -rE '^(<<<<<<<|=======|>>>>>>>$)' "./" | wc -l)
-
 git merge --no-edit "$branch2"
 cd - || exit 1