From dd75cfe0ad7bae76dd28e59bad83e035f366cc85 Mon Sep 17 00:00:00 2001
From: Mikrz <mik@mikrz.ca>
Date: Mon, 11 Nov 2024 16:34:02 -0500
Subject: [PATCH] Remove missed git merge junk

---
 build-packages.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build-packages.sh b/build-packages.sh
index 749b3fd819b..eb5f9001007 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -3,11 +3,6 @@
 TAG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
 OUT_VERSION=$(echo $TAG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
 echo $TAG_VERSION
-=======
-ORIG_VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
-OUT_VERSION=$(echo $ORIG_VERSION | sed -E 's/([0-9]{4}\.[0-9]{1,2}\.[0-9]+-[0-9]+).*/\1/')
-echo $ORIG_VERSION
->>>>>>> Stashed changes
 
 # Disable FIPS module in go-boring
 export GOEXPERIMENT=noboringcrypto