about summary refs log tree commit diff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rwxr-xr-xutils/crash_triage/triage_crashes.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/utils/crash_triage/triage_crashes.sh b/utils/crash_triage/triage_crashes.sh
index 9ca1d5fc..4d75430e 100755
--- a/utils/crash_triage/triage_crashes.sh
+++ b/utils/crash_triage/triage_crashes.sh
@@ -65,11 +65,7 @@ if [ ! -f "$BIN" -o ! -x "$BIN" ]; then
 fi
 
 if [ ! -d "$DIR/queue" ]; then
-<<<<<<< Updated upstream
   echo "[-] Error: directory '$DIR' not found or not created by afl-fuzz." 1>&2
-=======
-  echo "[-] Error: directory '$DIR/queue' not found or not created by afl-fuzz." 1>&2
->>>>>>> Stashed changes
   exit 1
 fi