From 343fb68ee26ee0e8dcd6ebc1b4c03ec2ced3d96d Mon Sep 17 00:00:00 2001
From: JeremyStarTM <jeremystartm@staropensource.de>
Date: Tue, 12 Mar 2024 19:28:40 +0100
Subject: [PATCH] Fix conflict resolution (once again)

---
 buildtool.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildtool.sh b/buildtool.sh
index d4a8956..7f25274 100755
--- a/buildtool.sh
+++ b/buildtool.sh
@@ -321,7 +321,8 @@ function ask_clonedir_conflictresolution() {
 		if [ -a "${BUILDTOOL_CLONEDIR}/src" ]; then
 			diagh "src/ directory present, appending \"--noextract\""
 			export "BUILDTOOL_MAKEPKG_REUSE= --noextract"
-		elif [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
+		fi
+		if [ -a "${BUILDTOOL_CLONEDIR}/pkg" ]; then
 			diagh "pkg/ directory present, appending \"--force\""
 			export "BUILDTOOL_MAKEPKG_REUSE=${BUILDTOOL_MAKEPKG_REUSE} --force"
 		fi