From 7b825537a17af1e1d6aeb7fe6727ed599a5e15a8 Mon Sep 17 00:00:00 2001
From: Mikrz <mik@mikrz.ca>
Date: Mon, 11 Nov 2024 16:34:31 -0500
Subject: [PATCH] Add package versions to the rpm and deb filenames

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

diff --git a/build-packages.sh b/build-packages.sh
index 749b3fd819b..14c1b54561b 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
-<<<<<<< Updated upstream
 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