Tidying up

apache · Oct 3, 2024 · 6d34234 · 6d34234
1 parent 0a8f69a
commit 6d34234
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/release/scripts/validate_staged_bundles.sh b/release/scripts/validate_staged_bundles.sh
@@ -26,11 +26,7 @@ declare -a extensions=("-javadoc.jar" "-javadoc.jar.asc" "-javadoc.jar.md5" "-ja
 "-sources.jar.asc" "-sources.jar.md5" "-sources.jar.sha1" ".jar" ".jar.asc" ".jar.md5" ".jar.sha1" ".pom" ".pom.asc"
 ".pom.md5" ".pom.sha1")
 
-<<<<<<< Updated upstream
-declare -a bundles=("xtable-api" "xtable-core" "xtable-hudi-support-extensions" "xtable-hudi-support-utils")
-=======
 declare -a bundles=("xtable-api" "xtable-core_2.12" "xtable-hudi-support-extensions_2.12" "xtable-hudi-support-utils")
->>>>>>> Stashed changes
 
 NOW=$(date +%s)
 TMP_DIR_FOR_BUNDLES=/tmp/${NOW}