From 02982365e53e8afdb48455a68f712d5d4f59a1c6 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Oct 2023 00:05:55 +0100
Subject: [PATCH] hhhhhhhhh

---
 .gitea/workflows/convert-to-yml.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 8fcd786..731666a 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -41,7 +41,7 @@ jobs:
           git checkout ${{ env.PRODUCTION_BRANCH }}
           git pull
           git log -5
-          git merge master
+          git merge origin/master
           git push origin HEAD
       - name: make pull request
         run: |