From 5400b53edf17c8cb56b65852d6d077943aefc87e Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Fri, 5 Apr 2024 22:40:31 +0200 Subject: [PATCH] Revert "fix release tooling to support/5 branch" This reverts commit 569cef71d0fc45aeed260170c4ad66626d791161. --- make-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-release.sh b/make-release.sh index a5e9ffdea..2b6db0d75 100755 --- a/make-release.sh +++ b/make-release.sh @@ -15,7 +15,7 @@ php utilities/update-smarty-version-number.php $1 git add changelog CHANGELOG.md src/Smarty.php git commit -m "version bump" -git checkout support/5 +git checkout master git pull git merge --no-ff "release/$1" git branch -d "release/$1"