Skip to content

Commit

Permalink
Merge branch '3.3.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
marc1706 committed Sep 28, 2024
2 parents e21d7be + d8dc120 commit 9938613
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/check_merge_to_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
id: merge_master
run: |
git checkout master
if git merge --no-ff origin/3.3.x --no-commit; then
if git merge --no-ff 3.3.x --no-commit; then
echo "mergeable=true" >> $GITHUB_OUTPUT
else
echo "mergeable=false" >> $GITHUB_OUTPUT
Expand Down

0 comments on commit 9938613

Please sign in to comment.