Update build-packages.sh

cloudflare · Nov 11, 2024 · e4024a5 · e4024a5
1 parent dd75cfe
commit e4024a5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/build-packages.sh b/build-packages.sh
@@ -1,5 +1,4 @@
 #!/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