From e3d7c23dfb3ba92dd77fa1549489181055718ad5 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 21 Jun 2024 11:26:20 +0200 Subject: [PATCH] Fix forward merge script --- git/hooks/prepare-forward-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index 1bf66fc1bd0..da1a1ae1bd3 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -4,7 +4,7 @@ require 'net/http' require 'yaml' require 'logger' -$main_branch = "3.3.x" +$main_branch = "3.4.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN