Remove missed git merge junk

cloudflare · Nov 11, 2024 · dd75cfe · dd75cfe
1 parent 3063497
commit dd75cfe
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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