From b5e5e746d82564a2fce3ec916a12ef814c715b1d Mon Sep 17 00:00:00 2001
From: vanhauser-thc <vh@thc.org>
Date: Fri, 10 Nov 2023 14:09:15 +0100
Subject: [PATCH] fix conflict

---
 cargo-afl/AFLplusplus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cargo-afl/AFLplusplus b/cargo-afl/AFLplusplus
index a6efdfdb1..7e67dc9d6 160000
--- a/cargo-afl/AFLplusplus
+++ b/cargo-afl/AFLplusplus
@@ -1 +1 @@
-Subproject commit a6efdfdb15c8a48967ff773a0ca530a68544cd8f
+Subproject commit 7e67dc9d6938aadef19d5697a448cdf15a50172f